Switch dart:html objects not to be NativeFieldWrapper subclasses with JsInterop

tools/dom/scripts/systemhtml.py

 #!/usr/bin/python
 # 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.
 
 """This module provides shared functionality for the system to generate
 Dart:html APIs from the IDL database."""
 
 import emitter
 import logging
@@ skipping 550 matching lines @@
     mixins = self._backend.Mixins()
 
     mixins_str = ''
     if mixins:
       mixins_str = ' with ' + ', '.join(mixins)
       if not base_class:
         base_class = 'Interceptor'
       elif (base_class == 'NativeFieldWrapperClass2' and
             self._options.dart_js_interop and
             not(isinstance(self._backend, Dart2JSBackend))):
-        base_class = 'JsoNativeFieldWrapper'
+        base_class = 'DartHtmlDomObject'
 
     annotations = self._metadata.GetFormattedMetadata(
         self._library_name, self._interface, None, '')
 
     class_modifiers = ''
     if (self._renamer.ShouldSuppressInterface(self._interface) or
       IsPureInterface(self._interface.id)):
       # XMLHttpRequestProgressEvent can't be abstract we need to instantiate
       # for JsInterop.
       if (not(isinstance(self._backend, Dart2JSBackend)) and
@@ skipping 31 matching lines @@
     return new {0}._internalWrap();
   }}
 
   factory {0}._internalWrap() {{
     return new {0}.internal_();
   }}
 
   {0}.internal_() : super.internal_();
 
 '''.format(class_name)
-    if base_class == 'NativeFieldWrapperClass2' or base_class == 'JsoNativeFieldWrapper':
+    if base_class == 'NativeFieldWrapperClass2' or base_class == 'DartHtmlDomObject':
         js_interop_wrapper = '''
   static {0} internalCreate{0}() {{
     return new {0}._internalWrap();
   }}
 
-  js.JsObject blink_jsObject;
-
   factory {0}._internalWrap() {{
     return new {0}.internal_();
   }}
 
   {0}.internal_() {{ }}
 
 {1}'''.format(class_name, js_interop_equivalence_op)
         # Change to use the synthesized class so we can construct with a mixin
         # classes prefixed with name of NativeFieldWrapperClass2 don't have a
         # default constructor so classes with mixins can't be new'd.
         if (self._options.templates._conditions['DARTIUM'] and
             self._options.dart_js_interop and
             (self._interface.id == 'NamedNodeMap' or
              self._interface.id == 'CSSStyleDeclaration')):
-            base_class = 'JsoNativeFieldWrapper'
+            base_class = 'DartHtmlDomObject'
 
     implementation_members_emitter = implementation_emitter.Emit(
         self._backend.ImplementationTemplate(),
         LIBRARYNAME='dart.dom.%s' % self._library_name,
         ANNOTATIONS=annotations,
         CLASS_MODIFIERS=class_modifiers,
         CLASSNAME=class_name,
         EXTENDS=' extends %s' % base_class if base_class else '',
         IMPLEMENTS=implements_str,
         MIXINS=mixins_str,
@@ skipping 680 matching lines @@
 
   def AddFile(self, basename, library_name, path):
     self._libraries[library_name].AddFile(path)
 
   def AddTypeEntry(self, library_name, idl_name, dart_name):
     self._libraries[library_name].AddTypeEntry(idl_name, dart_name)
 
   def Emit(self, emitter, auxiliary_dir):
     for lib in self._libraries.values():
       lib.Emit(emitter, auxiliary_dir)