Index: sdk/lib/html/dartium/html_dartium.dart |
diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart |
index 224e009186c7de63b9a25ab6140020c7872b8539..0565ecae73cdd54725d1a3d0e0b24fb5161ad3f3 100644 |
--- a/sdk/lib/html/dartium/html_dartium.dart |
+++ b/sdk/lib/html/dartium/html_dartium.dart |
@@ -17,25 +17,24 @@ import 'dart:svg' as svg; |
-// FIXME (blois): Rename to _window (ditto __document). |
-LocalWindow __window; |
+LocalWindow _window; |
LocalWindow get window { |
- if (__window != null) { |
- return __window; |
+ if (_window != null) { |
+ return _window; |
} |
- __window = _Utils.window(); |
- return __window; |
+ _window = _Utils.window(); |
+ return _window; |
} |
-Document __document; |
+HtmlDocument _document; |
-Document get document { |
- if (__document != null) { |
- return __document; |
+HtmlDocument get document { |
+ if (_document != null) { |
+ return _document; |
} |
- __document = window.document; |
- return __document; |
+ _document = window.document; |
+ return _document; |
} |
@@ -6878,7 +6877,7 @@ class DOMImplementation extends NativeFieldWrapperClass1 { |
/** @domName DOMImplementation.createHTMLDocument */ |
- Document createHTMLDocument(String title) native "DOMImplementation_createHTMLDocument_Callback"; |
+ HtmlDocument createHTMLDocument(String title) native "DOMImplementation_createHTMLDocument_Callback"; |
/** @domName DOMImplementation.hasFeature */ |
@@ -8011,7 +8010,7 @@ class DivElement extends _Element_Merged { |
// BSD-style license that can be found in the LICENSE file. |
-class Document extends Node |
+class Document extends Node |
{ |
Document.internal(): super.internal(); |
@@ -8022,16 +8021,13 @@ class Document extends Node |
DocumentEvents get on => |
new DocumentEvents(this); |
- /** @domName HTMLDocument.activeElement */ |
- Element get activeElement; |
- |
/** @domName Document.body */ |
- Element get body native "Document_body_Getter"; |
+ Element get $dom_body native "Document_body_Getter"; |
/** @domName Document.body */ |
- void set body(Element value) native "Document_body_Setter"; |
+ void set $dom_body(Element value) native "Document_body_Setter"; |
/** @domName Document.charset */ |
@@ -8063,7 +8059,7 @@ class Document extends Node |
/** @domName Document.head */ |
- HeadElement get head native "Document_head_Getter"; |
+ HeadElement get $dom_head native "Document_head_Getter"; |
/** @domName Document.implementation */ |
@@ -8071,7 +8067,7 @@ class Document extends Node |
/** @domName Document.lastModified */ |
- String get lastModified native "Document_lastModified_Getter"; |
+ String get $dom_lastModified native "Document_lastModified_Getter"; |
/** @domName Document.preferredStylesheetSet */ |
@@ -8083,7 +8079,7 @@ class Document extends Node |
/** @domName Document.referrer */ |
- String get referrer native "Document_referrer_Getter"; |
+ String get $dom_referrer native "Document_referrer_Getter"; |
/** @domName Document.selectedStylesheetSet */ |
@@ -8095,51 +8091,43 @@ class Document extends Node |
/** @domName Document.styleSheets */ |
- List<StyleSheet> get styleSheets native "Document_styleSheets_Getter"; |
+ List<StyleSheet> get $dom_styleSheets native "Document_styleSheets_Getter"; |
/** @domName Document.title */ |
- String get title native "Document_title_Getter"; |
+ String get $dom_title native "Document_title_Getter"; |
/** @domName Document.title */ |
- void set title(String value) native "Document_title_Setter"; |
- |
- |
- /** @domName Document.webkitCurrentFullScreenElement */ |
- Element get webkitCurrentFullScreenElement native "Document_webkitCurrentFullScreenElement_Getter"; |
- |
- |
- /** @domName Document.webkitFullScreenKeyboardInputAllowed */ |
- bool get webkitFullScreenKeyboardInputAllowed native "Document_webkitFullScreenKeyboardInputAllowed_Getter"; |
+ void set $dom_title(String value) native "Document_title_Setter"; |
/** @domName Document.webkitFullscreenElement */ |
- Element get webkitFullscreenElement native "Document_webkitFullscreenElement_Getter"; |
+ Element get $dom_webkitFullscreenElement native "Document_webkitFullscreenElement_Getter"; |
/** @domName Document.webkitFullscreenEnabled */ |
- bool get webkitFullscreenEnabled native "Document_webkitFullscreenEnabled_Getter"; |
+ bool get $dom_webkitFullscreenEnabled native "Document_webkitFullscreenEnabled_Getter"; |
/** @domName Document.webkitHidden */ |
- bool get webkitHidden native "Document_webkitHidden_Getter"; |
+ bool get $dom_webkitHidden native "Document_webkitHidden_Getter"; |
/** @domName Document.webkitIsFullScreen */ |
- bool get webkitIsFullScreen native "Document_webkitIsFullScreen_Getter"; |
+ bool get $dom_webkitIsFullScreen native "Document_webkitIsFullScreen_Getter"; |
/** @domName Document.webkitPointerLockElement */ |
- Element get webkitPointerLockElement native "Document_webkitPointerLockElement_Getter"; |
+ Element get $dom_webkitPointerLockElement native "Document_webkitPointerLockElement_Getter"; |
/** @domName Document.webkitVisibilityState */ |
- String get webkitVisibilityState native "Document_webkitVisibilityState_Getter"; |
+ String get $dom_webkitVisibilityState native "Document_webkitVisibilityState_Getter"; |
/** @domName Document.caretRangeFromPoint */ |
- Range caretRangeFromPoint(int x, int y) native "Document_caretRangeFromPoint_Callback"; |
+ Range $dom_caretRangeFromPoint(int x, int y) native "Document_caretRangeFromPoint_Callback"; |
/** @domName Document.createCDATASection */ |
@@ -8179,7 +8167,7 @@ class Document extends Node |
/** @domName Document.elementFromPoint */ |
- Element elementFromPoint(int x, int y) native "Document_elementFromPoint_Callback"; |
+ Element $dom_elementFromPoint(int x, int y) native "Document_elementFromPoint_Callback"; |
/** @domName Document.execCommand */ |
@@ -8235,15 +8223,15 @@ class Document extends Node |
/** @domName Document.webkitCancelFullScreen */ |
- void webkitCancelFullScreen() native "Document_webkitCancelFullScreen_Callback"; |
+ void $dom_webkitCancelFullScreen() native "Document_webkitCancelFullScreen_Callback"; |
/** @domName Document.webkitExitFullscreen */ |
- void webkitExitFullscreen() native "Document_webkitExitFullscreen_Callback"; |
+ void $dom_webkitExitFullscreen() native "Document_webkitExitFullscreen_Callback"; |
/** @domName Document.webkitExitPointerLock */ |
- void webkitExitPointerLock() native "Document_webkitExitPointerLock_Callback"; |
+ void $dom_webkitExitPointerLock() native "Document_webkitExitPointerLock_Callback"; |
// TODO(jacobr): implement all Element methods not on Document. |
@@ -8485,7 +8473,7 @@ class DocumentFragment extends Node { |
this.insertAdjacentText('beforeend', text); |
} |
- void addHTML(String text) { |
+ void addHtml(String text) { |
this.insertAdjacentHTML('beforeend', text); |
} |
@@ -9340,7 +9328,7 @@ class Element extends Node implements ElementTraversal { |
* Parses the specified text as HTML and adds the resulting node after the |
* last child of this. |
*/ |
- void addHTML(String text) { |
+ void addHtml(String text) { |
this.insertAdjacentHTML('beforeend', text); |
} |
@@ -11961,6 +11949,92 @@ class HeadingElement extends _Element_Merged { |
// WARNING: Do not edit - generated code. |
+class HtmlDocument extends Document { |
+ HtmlDocument.internal(): super.internal(); |
+ |
+ |
+ /** @domName HTMLDocument.activeElement */ |
+ Element get activeElement native "HTMLDocument_activeElement_Getter"; |
+ |
+ /** @domName Document.body */ |
+ BodyElement get body => document.$dom_body; |
+ |
+ /** @domName Document.body */ |
+ void set body(BodyElement value) { |
+ document.$dom_body = value; |
+ } |
+ |
+ /** @domName Document.caretRangeFromPoint */ |
+ Range caretRangeFromPoint(int x, int y) { |
+ return document.$dom_caretRangeFromPoint(x, y); |
+ } |
+ |
+ /** @domName Document.elementFromPoint */ |
+ Element elementFromPoint(int x, int y) { |
+ return document.$dom_elementFromPoint(x, y); |
+ } |
+ |
+ /** @domName Document.head */ |
+ HeadElement get head => document.$dom_head; |
+ |
+ /** @domName Document.lastModified */ |
+ String get lastModified => document.$dom_lastModified; |
+ |
+ /** @domName Document.referrer */ |
+ String get referrer => document.$dom_referrer; |
+ |
+ /** @domName Document.styleSheets */ |
+ List<StyleSheet> get styleSheets => document.$dom_styleSheets; |
+ |
+ /** @domName Document.title */ |
+ String get title => document.$dom_title; |
+ |
+ /** @domName Document.title */ |
+ void set title(String value) { |
+ document.$dom_title = value; |
+ } |
+ |
+ /** @domName Document.webkitCancelFullScreen */ |
+ void webkitCancelFullScreen() { |
+ document.$dom_webkitCancelFullScreen(); |
+ } |
+ |
+ /** @domName Document.webkitExitFullscreen */ |
+ void webkitExitFullscreen() { |
+ document.$dom_webkitExitFullscreen(); |
+ } |
+ |
+ /** @domName Document.webkitExitPointerLock */ |
+ void webkitExitPointerLock() { |
+ document.$dom_webkitExitPointerLock(); |
+ } |
+ |
+ /** @domName Document.webkitFullscreenElement */ |
+ Element get webkitFullscreenElement => document.$dom_webkitFullscreenElement; |
+ |
+ /** @domName Document.webkitFullscreenEnabled */ |
+ bool get webkitFullscreenEnabled => document.$dom_webkitFullscreenEnabled; |
+ |
+ /** @domName Document.webkitHidden */ |
+ bool get webkitHidden => document.$dom_webkitHidden; |
+ |
+ /** @domName Document.webkitIsFullScreen */ |
+ bool get webkitIsFullScreen => document.$dom_webkitIsFullScreen; |
+ |
+ /** @domName Document.webkitPointerLockElement */ |
+ Element get webkitPointerLockElement => |
+ document.$dom_webkitPointerLockElement; |
+ |
+ /** @domName Document.webkitVisibilityState */ |
+ String get webkitVisibilityState => document.$dom_webkitVisibilityState; |
+} |
+// 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 |
+// BSD-style license that can be found in the LICENSE file. |
+ |
+// WARNING: Do not edit - generated code. |
+ |
+ |
/// @domName HTMLHtmlElement |
class HtmlElement extends _Element_Merged { |
@@ -14944,10 +15018,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"; |
@@ -15252,10 +15322,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"; |
@@ -17600,7 +17666,7 @@ class Node extends EventTarget { |
/** @domName Node.nodeType */ |
- int get $dom_nodeType native "Node_nodeType_Getter"; |
+ int get nodeType native "Node_nodeType_Getter"; |
/** @domName Node.ownerDocument */ |
@@ -26867,22 +26933,6 @@ class _DataViewFactoryProvider { |
// WARNING: Do not edit - generated code. |
-/// @domName HTMLDocument |
-class _Document_Merged extends Document { |
- _Document_Merged.internal(): super.internal(); |
- |
- |
- /** @domName HTMLDocument.activeElement */ |
- Element get activeElement native "HTMLDocument_activeElement_Getter"; |
- |
-} |
-// 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 |
-// BSD-style license that can be found in the LICENSE file. |
- |
-// WARNING: Do not edit - generated code. |
- |
- |
/// @domName HTMLElement |
class _Element_Merged extends Element { |
_Element_Merged.internal(): super.internal(); |
@@ -28512,6 +28562,7 @@ abstract class History { |
// for details. All rights reserved. Use of this source code is governed by a |
// BSD-style license that can be found in the LICENSE file. |
+ |
abstract class CssClassSet implements Set<String> { |
String toString() { |
@@ -28641,6 +28692,7 @@ typedef void EventListener(Event event); |
// for details. All rights reserved. Use of this source code is governed by a |
// BSD-style license that can be found in the LICENSE file. |
+ |
class FilteredElementList implements List { |
final Node _node; |
final List<Node> _childNodes; |
@@ -29706,6 +29758,7 @@ class _DocumentFragmentFactoryProvider { |
// for details. All rights reserved. Use of this source code is governed by a |
// BSD-style license that can be found in the LICENSE file. |
+ |
class _AudioContextFactoryProvider { |
static AudioContext createAudioContext() => _createAudioContext(); |
static _createAudioContext([int numberOfChannels, |
@@ -30302,11 +30355,11 @@ class _MessageTraverser { |
return visitObject(x); |
} |
- abstract visitPrimitive(x); |
- abstract visitList(List x); |
- abstract visitMap(Map x); |
- abstract visitSendPort(SendPort x); |
- abstract visitSendPortSync(SendPortSync x); |
+ visitPrimitive(x); |
+ visitList(List x); |
+ visitMap(Map x); |
+ visitSendPort(SendPort x); |
+ visitSendPortSync(SendPortSync x); |
visitObject(Object x) { |
// TODO(floitsch): make this a real exception. (which one)? |
@@ -30457,7 +30510,7 @@ class _Deserializer { |
return result; |
} |
- abstract deserializeSendPort(List x); |
+ deserializeSendPort(List x); |
deserializeObject(List x) { |
// TODO(floitsch): Use real exception (which one?). |
@@ -30469,6 +30522,7 @@ class _Deserializer { |
// for details. All rights reserved. Use of this source code is governed by a |
// BSD-style license that can be found in the LICENSE file. |
+ |
/** |
* Checks to see if the mutation observer API is supported on the current |
* platform. |
@@ -30602,6 +30656,7 @@ class _Lists { |
// for details. All rights reserved. Use of this source code is governed by a |
// BSD-style license that can be found in the LICENSE file. |
+ |
// This API is exploratory. |
spawnDomFunction(Function topLevelFunction) => _Utils.spawnDomFunctionImpl(topLevelFunction); |
@@ -30631,6 +30686,7 @@ class TestRunner { |
// for details. All rights reserved. Use of this source code is governed by a |
// BSD-style license that can be found in the LICENSE file. |
+ |
class _Utils { |
static List convertToList(List list) { |
// FIXME: [possible optimization]: do not copy the array if Dart_IsArray is fine w/ it. |