Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Unified Diff: lib/dom/templates/html/dartium/html_dartium.darttemplate

Issue 10383302: Move dart:dom implementation classes to dart:html library. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: . Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: lib/dom/templates/html/dartium/html_dartium.darttemplate
diff --git a/lib/dom/templates/html/dartium/html_dartium.darttemplate b/lib/dom/templates/html/dartium/html_dartium.darttemplate
index 5991e3a77c81a34bf8b426f530c4f7d96518258e..30b44010869e1111330533000e550859878601cd 100644
--- a/lib/dom/templates/html/dartium/html_dartium.darttemplate
+++ b/lib/dom/templates/html/dartium/html_dartium.darttemplate
@@ -7,7 +7,8 @@
#library("html");
-#import('dart:dom_deprecated', prefix:'dom');
+#import("dart:isolate");
+#import("dart:nativewrappers");
$!GENERATED_DART_FILES
@@ -26,12 +27,16 @@ $!GENERATED_DART_FILES
#source('$AUXILIARY_DIR/_ListIterators.dart');
#source('$AUXILIARY_DIR/_Lists.dart');
+#source('$AUXILIARY_DIR/native_DOMWrapperBase.dart');
+#source('$AUXILIARY_DIR/native_DOMPublic.dart');
+#source('$AUXILIARY_DIR/native_DOMImplementation.dart');
+
_WindowImpl __window;
_DocumentImpl __document;
void _initialize() {
- __window = _wrap(dom.window);
- __document = _wrap(dom.document);
+ __window = _wrap(_Utils.window());
+ __document = _wrap(_Utils.window().document);
}
Window get window() {
@@ -66,12 +71,10 @@ _unwrap(raw) {
return raw is _DOMTypeBase ? raw._ptr : raw;
}
-unwrap_internal(raw) => _unwrap(raw);
-
// Warning: does not attempt wrap event listeners.
_wrap(raw) {
- if (raw is! dom.DOMType) return raw;
- dom.DOMType domObject = raw;
+ if (raw is! _DOMWrapperBase) return raw;
+ _DOMWrapperBase domObject = raw;
if (domObject.dartObjectLocalStorage != null)
return domObject.dartObjectLocalStorage;
switch(domObject.typeName) {
@@ -84,11 +87,3 @@ $WRAPCASES
throw 'Unrecognized object $domObject. Name=${domObject.typeName}';
}
}
-
-wrap_internal(raw) => _wrap(raw);
-
-spawnDomIsolate(Window targetWindow, String entryPoint) =>
- dom.spawnDomIsolate(_unwrap(targetWindow), entryPoint);
-
-dom.LayoutTestController get layoutTestController() =>
- dom.layoutTestController;

Powered by Google App Engine
This is Rietveld 408576698