Index: tools/dom/src/native_DOMImplementation.dart |
diff --git a/tools/dom/src/native_DOMImplementation.dart b/tools/dom/src/native_DOMImplementation.dart |
index 9f74d3e1c7471e613522f960fd8c54004f0d37d2..34c032bb7377e674228c7e78276c1cbdbc2f9816 100644 |
--- a/tools/dom/src/native_DOMImplementation.dart |
+++ b/tools/dom/src/native_DOMImplementation.dart |
@@ -187,7 +187,9 @@ class _Utils { |
return element; |
} |
- static window() => wrap_jso(js.context['window']); |
+ // TODO(terry): Enable below for Dartium w/ interop and remove other static window(). |
+ // static window() => wrap_jso(_blink.Blink_Utils.window()['window']); |
+ static window() => _blink.Blink_Utils.window(); |
static forwardingPrint(String message) => _blink.Blink_Utils.forwardingPrint(message); |
static void spawnDomHelper(Function f, int replyTo) => |
@@ -804,19 +806,15 @@ class _Utils { |
static Element createElement(Document document, String tagName) => |
wrap_jso(_blink.Blink_Utils.createElement(unwrap_jso(document), tagName)); |
+ static void initializeCustomElement(HtmlElement element) => |
+ _blink.Blink_Utils.initializeCustomElement(unwrap_jso(element)); |
+ |
static Element changeElementWrapper(HtmlElement element, Type type) => |
_blink.Blink_Utils.changeElementWrapper(unwrap_jso(element), type); |
} |
class _DOMWindowCrossFrame extends NativeFieldWrapperClass2 implements |
WindowBase { |
- /** Needed because KeyboardEvent is implements. |
- * TODO(terry): Consider making blink_jsObject private (add underscore) for |
- * all blink_jsObject. Then needed private wrap/unwrap_jso |
- * functions that delegate to a public wrap/unwrap_jso. |
- */ |
- js.JsObject blink_jsObject; |
- |
_DOMWindowCrossFrame.internal(); |
// Fields. |
@@ -875,7 +873,7 @@ class _LocationCrossFrame extends NativeFieldWrapperClass2 implements LocationBa |
_LocationCrossFrame.internal(); |
// Fields. |
- set href(String h) => _blink.Blink_LocationCrossFrame.set_href(this, h); |
+ void set href(String h) => _blink.Blink_LocationCrossFrame.set_href(this, h); |
// Implementation support. |
String get typeName => "Location"; |
@@ -1111,6 +1109,10 @@ get _pureIsolateScheduleImmediateClosure => ((void callback()) => |
throw new UnimplementedError("scheduleMicrotask in background isolates " |
"are not supported in the browser")); |
+void _initializeCustomElement(Element e) { |
+ _Utils.initializeCustomElement(e); |
+} |
+ |
// Class for unsupported native browser 'DOM' objects. |
class _UnsupportedBrowserObject extends NativeFieldWrapperClass2 { |
} |