sdk/lib/html/dartium/html_dartium.dart

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 a3885eeec5d4a4e09e1631e69b17e27724cf4f17..58de55c59a34b4bd5cc701155a4e51780e241f99 100644
--- a/sdk/lib/html/dartium/html_dartium.dart
+++ b/sdk/lib/html/dartium/html_dartium.dart
@@ -1154,8 +1154,9 @@ wrap_jso(jsObject) {
     // TODO(alanknight): With upgraded custom elements this causes a failure because
     // we need a new wrapper after the type changes. We could possibly invalidate this
     // if the constructor name didn't match?
-    if (jsObject.dartWrapper != null) {
-      return jsObject.dartWrapper;
+    var wrapper = js.getDartHtmlWrapperFor(jsObject);
+    if (wrapper != null) {
+      return wrapper;
     }
 
     // Try the most general type conversions on it.
@@ -1184,7 +1185,7 @@ wrap_jso(jsObject) {
       if (func != null) {
         dartClass_instance = func();
         dartClass_instance.blink_jsObject = jsObject;
-        jsObject.dartWrapper = dartClass_instance;
+        js.setDartHtmlWrapperFor(jsObject, dartClass_instance);
       }
     }
     return dartClass_instance;