mirror of
https://github.com/dart-lang/sdk
synced 2024-10-14 19:21:30 +00:00
Fixing renamer- I messed up a merge and broke the renaming from the CL to dartify members.
This caused the generator to emit members it should not have. BUG= Review URL: https://codereview.chromium.org//11428028 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@15407 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
blois@google.com
parent
2688c60a05
commit
e4f7754862
|
|
@ -173,9 +173,6 @@ class AnchorElement extends Element implements Element native "*HTMLAnchorElemen
|
|||
/// @domName HTMLAnchorElement.target; @docsEditable true
|
||||
String target;
|
||||
|
||||
/// @domName HTMLAnchorElement.text; @docsEditable true
|
||||
final String text;
|
||||
|
||||
/// @domName HTMLAnchorElement.type; @docsEditable true
|
||||
String type;
|
||||
|
||||
|
|
@ -958,9 +955,6 @@ class BodyElement extends Element implements Element native "*HTMLBodyElement" {
|
|||
/// @domName HTMLBodyElement.link; @docsEditable true
|
||||
String link;
|
||||
|
||||
/// @domName HTMLBodyElement.text; @docsEditable true
|
||||
String text;
|
||||
|
||||
/// @domName HTMLBodyElement.vLink; @docsEditable true
|
||||
String vLink;
|
||||
}
|
||||
|
|
@ -6451,9 +6445,6 @@ class DirectoryReaderSync native "*DirectoryReaderSync" {
|
|||
class DivElement extends Element implements Element native "*HTMLDivElement" {
|
||||
|
||||
factory DivElement() => document.$dom_createElement("div");
|
||||
|
||||
/// @domName HTMLDivElement.align; @docsEditable true
|
||||
String align;
|
||||
}
|
||||
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
|
||||
// for details. All rights reserved. Use of this source code is governed by a
|
||||
|
|
@ -8997,9 +8988,6 @@ class FormElement extends Element implements Element native "*HTMLFormElement" {
|
|||
/// @domName HTMLFormElement.autocomplete; @docsEditable true
|
||||
String autocomplete;
|
||||
|
||||
/// @domName HTMLFormElement.elements; @docsEditable true
|
||||
final HTMLCollection elements;
|
||||
|
||||
/// @domName HTMLFormElement.encoding; @docsEditable true
|
||||
String encoding;
|
||||
|
||||
|
|
@ -9587,12 +9575,6 @@ class HtmlDocument extends Document native "*HTMLDocument" {
|
|||
class HtmlElement extends Element implements Element native "*HTMLHtmlElement" {
|
||||
|
||||
factory HtmlElement() => document.$dom_createElement("html");
|
||||
|
||||
/// @domName HTMLHtmlElement.manifest; @docsEditable true
|
||||
String manifest;
|
||||
|
||||
/// @domName HTMLHtmlElement.version; @docsEditable true
|
||||
String version;
|
||||
}
|
||||
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
|
||||
// for details. All rights reserved. Use of this source code is governed by a
|
||||
|
|
@ -11788,9 +11770,6 @@ class LocalWindow extends EventTarget implements Window native "@*DOMWindow" {
|
|||
/// @domName Window.applicationCache; @docsEditable true
|
||||
final DOMApplicationCache applicationCache;
|
||||
|
||||
/// @domName Window.clientInformation; @docsEditable true
|
||||
final Navigator clientInformation;
|
||||
|
||||
/// @domName Window.closed; @docsEditable true
|
||||
final bool closed;
|
||||
|
||||
|
|
@ -11812,10 +11791,6 @@ class LocalWindow extends EventTarget implements Window native "@*DOMWindow" {
|
|||
/// @domName Window.event; @docsEditable true
|
||||
final Event event;
|
||||
|
||||
/// @domName Window.frames; @docsEditable true
|
||||
Window get frames => _convertNativeToDart_Window(this._frames);
|
||||
dynamic get _frames => JS("dynamic", "#.frames", this);
|
||||
|
||||
/// @domName Window.history; @docsEditable true
|
||||
final LocalHistory history;
|
||||
|
||||
|
|
@ -11825,9 +11800,6 @@ class LocalWindow extends EventTarget implements Window native "@*DOMWindow" {
|
|||
/// @domName Window.innerWidth; @docsEditable true
|
||||
final int innerWidth;
|
||||
|
||||
/// @domName Window.length; @docsEditable true
|
||||
final int length;
|
||||
|
||||
/// @domName Window.localStorage; @docsEditable true
|
||||
final Storage localStorage;
|
||||
|
||||
|
|
@ -11944,9 +11916,6 @@ class LocalWindow extends EventTarget implements Window native "@*DOMWindow" {
|
|||
/// @domName Window.atob; @docsEditable true
|
||||
String atob(String string) native;
|
||||
|
||||
/// @domName Window.blur; @docsEditable true
|
||||
void blur() native;
|
||||
|
||||
/// @domName Window.btoa; @docsEditable true
|
||||
String btoa(String string) native;
|
||||
|
||||
|
|
@ -11971,11 +11940,8 @@ class LocalWindow extends EventTarget implements Window native "@*DOMWindow" {
|
|||
/// @domName Window.find; @docsEditable true
|
||||
bool find(String string, bool caseSensitive, bool backwards, bool wrap, bool wholeWord, bool searchInFrames, bool showDialog) native;
|
||||
|
||||
/// @domName Window.focus; @docsEditable true
|
||||
void focus() native;
|
||||
|
||||
/// @domName Window.getComputedStyle; @docsEditable true
|
||||
CSSStyleDeclaration getComputedStyle(Element element, String pseudoElement) native;
|
||||
CSSStyleDeclaration $dom_getComputedStyle(Element element, String pseudoElement) native "getComputedStyle";
|
||||
|
||||
/// @domName Window.getMatchedCSSRules; @docsEditable true
|
||||
@Returns('_CSSRuleList') @Creates('_CSSRuleList')
|
||||
|
|
@ -12018,9 +11984,6 @@ class LocalWindow extends EventTarget implements Window native "@*DOMWindow" {
|
|||
/// @domName Window.print; @docsEditable true
|
||||
void print() native;
|
||||
|
||||
/// @domName Window.prompt; @docsEditable true
|
||||
String prompt(String message, String defaultValue) native;
|
||||
|
||||
/// @domName Window.releaseEvents; @docsEditable true
|
||||
void releaseEvents() native;
|
||||
|
||||
|
|
@ -12054,9 +12017,6 @@ class LocalWindow extends EventTarget implements Window native "@*DOMWindow" {
|
|||
/// @domName Window.stop; @docsEditable true
|
||||
void stop() native;
|
||||
|
||||
/// @domName Window.webkitCancelRequestAnimationFrame; @docsEditable true
|
||||
void webkitCancelRequestAnimationFrame(int id) native;
|
||||
|
||||
/// @domName Window.webkitConvertPointFromNodeToPage; @docsEditable true
|
||||
Point webkitConvertPointFromNodeToPage(Node node, Point p) native;
|
||||
|
||||
|
|
@ -14261,9 +14221,6 @@ class OptionElement extends Element implements Element native "*HTMLOptionElemen
|
|||
/// @domName HTMLOptionElement.selected; @docsEditable true
|
||||
bool selected;
|
||||
|
||||
/// @domName HTMLOptionElement.text; @docsEditable true
|
||||
String text;
|
||||
|
||||
/// @domName HTMLOptionElement.value; @docsEditable true
|
||||
String value;
|
||||
}
|
||||
|
|
@ -15744,9 +15701,6 @@ class ScriptElement extends Element implements Element native "*HTMLScriptElemen
|
|||
/// @domName HTMLScriptElement.src; @docsEditable true
|
||||
String src;
|
||||
|
||||
/// @domName HTMLScriptElement.text; @docsEditable true
|
||||
String text;
|
||||
|
||||
/// @domName HTMLScriptElement.type; @docsEditable true
|
||||
String type;
|
||||
}
|
||||
|
|
@ -15887,9 +15841,6 @@ class SelectElement extends Element implements Element native "*HTMLSelectElemen
|
|||
/// @domName HTMLSelectElement.namedItem; @docsEditable true
|
||||
Node namedItem(String name) native;
|
||||
|
||||
/// @domName HTMLSelectElement.remove; @docsEditable true
|
||||
void remove(index_OR_option) native;
|
||||
|
||||
/// @domName HTMLSelectElement.setCustomValidity; @docsEditable true
|
||||
void setCustomValidity(String error) native;
|
||||
|
||||
|
|
@ -17470,9 +17421,6 @@ typedef void TimeoutHandler();
|
|||
class TitleElement extends Element implements Element native "*HTMLTitleElement" {
|
||||
|
||||
factory TitleElement() => document.$dom_createElement("title");
|
||||
|
||||
/// @domName HTMLTitleElement.text; @docsEditable true
|
||||
String text;
|
||||
}
|
||||
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
|
||||
// for details. All rights reserved. Use of this source code is governed by a
|
||||
|
|
|
|||
|
|
@ -319,10 +319,6 @@ class AnchorElement extends _Element_Merged {
|
|||
void set target(String value) native "HTMLAnchorElement_target_Setter";
|
||||
|
||||
|
||||
/** @domName HTMLAnchorElement.text */
|
||||
String get text native "HTMLAnchorElement_text_Getter";
|
||||
|
||||
|
||||
/** @domName HTMLAnchorElement.type */
|
||||
String get type native "HTMLAnchorElement_type_Getter";
|
||||
|
||||
|
|
@ -1603,14 +1599,6 @@ class BodyElement extends _Element_Merged {
|
|||
void set link(String value) native "HTMLBodyElement_link_Setter";
|
||||
|
||||
|
||||
/** @domName HTMLBodyElement.text */
|
||||
String get text native "HTMLBodyElement_text_Getter";
|
||||
|
||||
|
||||
/** @domName HTMLBodyElement.text */
|
||||
void set text(String value) native "HTMLBodyElement_text_Setter";
|
||||
|
||||
|
||||
/** @domName HTMLBodyElement.vLink */
|
||||
String get vLink native "HTMLBodyElement_vLink_Getter";
|
||||
|
||||
|
|
@ -8383,14 +8371,6 @@ class DivElement extends _Element_Merged {
|
|||
factory DivElement() => document.$dom_createElement("div");
|
||||
DivElement.internal(): super.internal();
|
||||
|
||||
|
||||
/** @domName HTMLDivElement.align */
|
||||
String get align native "HTMLDivElement_align_Getter";
|
||||
|
||||
|
||||
/** @domName HTMLDivElement.align */
|
||||
void set align(String value) native "HTMLDivElement_align_Setter";
|
||||
|
||||
}
|
||||
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
|
||||
// for details. All rights reserved. Use of this source code is governed by a
|
||||
|
|
@ -11393,10 +11373,6 @@ class FormElement extends _Element_Merged {
|
|||
void set autocomplete(String value) native "HTMLFormElement_autocomplete_Setter";
|
||||
|
||||
|
||||
/** @domName HTMLFormElement.elements */
|
||||
HTMLCollection get elements native "HTMLFormElement_elements_Getter";
|
||||
|
||||
|
||||
/** @domName HTMLFormElement.encoding */
|
||||
String get encoding native "HTMLFormElement_encoding_Getter";
|
||||
|
||||
|
|
@ -12192,22 +12168,6 @@ class HtmlElement extends _Element_Merged {
|
|||
factory HtmlElement() => document.$dom_createElement("html");
|
||||
HtmlElement.internal(): super.internal();
|
||||
|
||||
|
||||
/** @domName HTMLHtmlElement.manifest */
|
||||
String get manifest native "HTMLHtmlElement_manifest_Getter";
|
||||
|
||||
|
||||
/** @domName HTMLHtmlElement.manifest */
|
||||
void set manifest(String value) native "HTMLHtmlElement_manifest_Setter";
|
||||
|
||||
|
||||
/** @domName HTMLHtmlElement.version */
|
||||
String get version native "HTMLHtmlElement_version_Getter";
|
||||
|
||||
|
||||
/** @domName HTMLHtmlElement.version */
|
||||
void set version(String value) native "HTMLHtmlElement_version_Setter";
|
||||
|
||||
}
|
||||
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
|
||||
// for details. All rights reserved. Use of this source code is governed by a
|
||||
|
|
@ -15169,10 +15129,6 @@ class LocalWindow extends EventTarget implements Window {
|
|||
DOMApplicationCache get applicationCache native "DOMWindow_applicationCache_Getter";
|
||||
|
||||
|
||||
/** @domName DOMWindow.clientInformation */
|
||||
Navigator get clientInformation native "DOMWindow_clientInformation_Getter";
|
||||
|
||||
|
||||
/** @domName DOMWindow.closed */
|
||||
bool get closed native "DOMWindow_closed_Getter";
|
||||
|
||||
|
|
@ -15213,10 +15169,6 @@ class LocalWindow extends EventTarget implements Window {
|
|||
Event get event native "DOMWindow_event_Getter";
|
||||
|
||||
|
||||
/** @domName DOMWindow.frames */
|
||||
Window get frames native "DOMWindow_frames_Getter";
|
||||
|
||||
|
||||
/** @domName DOMWindow.history */
|
||||
LocalHistory get history native "DOMWindow_history_Getter";
|
||||
|
||||
|
|
@ -15233,10 +15185,6 @@ class LocalWindow extends EventTarget implements Window {
|
|||
int get innerWidth native "DOMWindow_innerWidth_Getter";
|
||||
|
||||
|
||||
/** @domName DOMWindow.length */
|
||||
int get length native "DOMWindow_length_Getter";
|
||||
|
||||
|
||||
/** @domName DOMWindow.localStorage */
|
||||
Storage get localStorage native "DOMWindow_localStorage_Getter";
|
||||
|
||||
|
|
@ -15401,10 +15349,6 @@ class LocalWindow extends EventTarget implements Window {
|
|||
String atob(String string) native "DOMWindow_atob_Callback";
|
||||
|
||||
|
||||
/** @domName DOMWindow.blur */
|
||||
void blur() native "DOMWindow_blur_Callback";
|
||||
|
||||
|
||||
/** @domName DOMWindow.btoa */
|
||||
String btoa(String string) native "DOMWindow_btoa_Callback";
|
||||
|
||||
|
|
@ -15441,12 +15385,8 @@ class LocalWindow extends EventTarget implements Window {
|
|||
bool find(String string, bool caseSensitive, bool backwards, bool wrap, bool wholeWord, bool searchInFrames, bool showDialog) native "DOMWindow_find_Callback";
|
||||
|
||||
|
||||
/** @domName DOMWindow.focus */
|
||||
void focus() native "DOMWindow_focus_Callback";
|
||||
|
||||
|
||||
/** @domName DOMWindow.getComputedStyle */
|
||||
CSSStyleDeclaration getComputedStyle(Element element, String pseudoElement) native "DOMWindow_getComputedStyle_Callback";
|
||||
CSSStyleDeclaration $dom_getComputedStyle(Element element, String pseudoElement) native "DOMWindow_getComputedStyle_Callback";
|
||||
|
||||
|
||||
/** @domName DOMWindow.getMatchedCSSRules */
|
||||
|
|
@ -15485,10 +15425,6 @@ class LocalWindow extends EventTarget implements Window {
|
|||
void print() native "DOMWindow_print_Callback";
|
||||
|
||||
|
||||
/** @domName DOMWindow.prompt */
|
||||
String prompt(String message, String defaultValue) native "DOMWindow_prompt_Callback";
|
||||
|
||||
|
||||
/** @domName DOMWindow.releaseEvents */
|
||||
void releaseEvents() native "DOMWindow_releaseEvents_Callback";
|
||||
|
||||
|
|
@ -15541,10 +15477,6 @@ class LocalWindow extends EventTarget implements Window {
|
|||
void webkitCancelAnimationFrame(int id) native "DOMWindow_webkitCancelAnimationFrame_Callback";
|
||||
|
||||
|
||||
/** @domName DOMWindow.webkitCancelRequestAnimationFrame */
|
||||
void webkitCancelRequestAnimationFrame(int id) native "DOMWindow_webkitCancelRequestAnimationFrame_Callback";
|
||||
|
||||
|
||||
/** @domName DOMWindow.webkitConvertPointFromNodeToPage */
|
||||
Point webkitConvertPointFromNodeToPage(Node node, Point p) native "DOMWindow_webkitConvertPointFromNodeToPage_Callback";
|
||||
|
||||
|
|
@ -18531,14 +18463,6 @@ class OptionElement extends _Element_Merged {
|
|||
void set selected(bool value) native "HTMLOptionElement_selected_Setter";
|
||||
|
||||
|
||||
/** @domName HTMLOptionElement.text */
|
||||
String get text native "HTMLOptionElement_text_Getter";
|
||||
|
||||
|
||||
/** @domName HTMLOptionElement.text */
|
||||
void set text(String value) native "HTMLOptionElement_text_Setter";
|
||||
|
||||
|
||||
/** @domName HTMLOptionElement.value */
|
||||
String get value native "HTMLOptionElement_value_Getter";
|
||||
|
||||
|
|
@ -20483,14 +20407,6 @@ class ScriptElement extends _Element_Merged {
|
|||
void set src(String value) native "HTMLScriptElement_src_Setter";
|
||||
|
||||
|
||||
/** @domName HTMLScriptElement.text */
|
||||
String get text native "HTMLScriptElement_text_Getter";
|
||||
|
||||
|
||||
/** @domName HTMLScriptElement.text */
|
||||
void set text(String value) native "HTMLScriptElement_text_Setter";
|
||||
|
||||
|
||||
/** @domName HTMLScriptElement.type */
|
||||
String get type native "HTMLScriptElement_type_Getter";
|
||||
|
||||
|
|
@ -20727,10 +20643,6 @@ class SelectElement extends _Element_Merged {
|
|||
Node namedItem(String name) native "HTMLSelectElement_namedItem_Callback";
|
||||
|
||||
|
||||
/** @domName HTMLSelectElement.remove */
|
||||
void remove(index_OR_option) native "HTMLSelectElement_remove_Callback";
|
||||
|
||||
|
||||
/** @domName HTMLSelectElement.setCustomValidity */
|
||||
void setCustomValidity(String error) native "HTMLSelectElement_setCustomValidity_Callback";
|
||||
|
||||
|
|
@ -23059,14 +22971,6 @@ class TitleElement extends _Element_Merged {
|
|||
factory TitleElement() => document.$dom_createElement("title");
|
||||
TitleElement.internal(): super.internal();
|
||||
|
||||
|
||||
/** @domName HTMLTitleElement.text */
|
||||
String get text native "HTMLTitleElement_text_Getter";
|
||||
|
||||
|
||||
/** @domName HTMLTitleElement.text */
|
||||
void set text(String value) native "HTMLTitleElement_text_Setter";
|
||||
|
||||
}
|
||||
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
|
||||
// for details. All rights reserved. Use of this source code is governed by a
|
||||
|
|
|
|||
|
|
@ -253,7 +253,7 @@ _removed_html_members = set([
|
|||
"Document.version",
|
||||
"Document.manifest",
|
||||
"HTMLIsIndexElement.*",
|
||||
"HTMLMenuElement.compact",
|
||||
"MenuElement.compact",
|
||||
"HTMLOptionsCollection.*",
|
||||
"HTMLPropertiesCollection.*",
|
||||
"SelectElement.remove",
|
||||
|
|
@ -342,7 +342,7 @@ class HtmlRenamer(object):
|
|||
|
||||
def _FindMatch(self, interface, member, member_prefix, candidates):
|
||||
for interface in self._database.Hierarchy(interface):
|
||||
html_interface_name = self.DartifyTypeName(interface.id)
|
||||
html_interface_name = self.RenameInterface(interface)
|
||||
member_name = html_interface_name + '.' + member
|
||||
if member_name in candidates:
|
||||
return member_name
|
||||
|
|
|
|||
Loading…
Reference in a new issue