Patched in Dartium JsInterop

tools/dom/scripts/css_code_generator.py

 #!/usr/bin/python
 #
 # Copyright (c) 2014, 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.
 
 """Generates CSSStyleDeclaration template file from css property definitions
 defined in WebKit."""
 
 import tempfile, os, re
@@ skipping 84 matching lines @@
 // The template file was generated by scripts/css_code_generator.py
 
 // Source of CSS properties:
 //   %s
 
 part of $LIBRARYNAME;
 """ % SOURCE_PATH)
 
 
   class_file.write("""
-$if DART2JS
 $(ANNOTATIONS)$(NATIVESPEC)$(CLASS_MODIFIERS)class $CLASSNAME $EXTENDS with
     $(CLASSNAME)Base $IMPLEMENTS {
-$else
-  $if JSINTEROP
-$(ANNOTATIONS)$(NATIVESPEC)$(CLASS_MODIFIERS) class $CLASSNAME extends
-    $(CLASSNAME)Base $IMPLEMENTS {
-  $else
-$(ANNOTATIONS)$(NATIVESPEC)$(CLASS_MODIFIERS)class $CLASSNAME $EXTENDS with
-    $(CLASSNAME)Base $IMPLEMENTS {
-  $endif
-$endif
   factory $CLASSNAME() => new CssStyleDeclaration.css('');
 
   factory $CLASSNAME.css(String css) {
     final style = new Element.tag('div').style;
     style.cssText = css;
     return style;
   }
 
   String getPropertyValue(String propertyName) {
     var propValue = _getPropertyValueHelper(propertyName);
@@ skipping 118 matching lines @@
 $if DART2JS
 """)
 
   for camelName in sorted(universal_properties):
     property = dashifyName(camelName)
     class_file.write("""
   /** Gets the value of "%s" */
   String get %s => this._%s;
 
   /** Sets the value of "%s" */
-  void set %s(String value) {
+  set %s(String value) {
     _%s = value == null ? '' : value;
   }
   @Returns('String')
   @JSName('%s')
   String _%s;
     """ % (property, camelName, camelName,
            property, camelName, camelName,
            camelName, camelName))
 
   class_file.write("""
 $endif
 }
 
-$if DART2JS
 class _CssStyleDeclarationSet extends Object with CssStyleDeclarationBase {
-$else
-  $if JSINTEROP
-class _CssStyleDeclarationSet extends CssStyleDeclarationBase {
-  $else
-class _CssStyleDeclarationSet extends Object with CssStyleDeclarationBase {
-  $endif
-$endif
   final Iterable<Element> _elementIterable;
   Iterable<CssStyleDeclaration> _elementCssStyleDeclarationSetIterable;
 
   _CssStyleDeclarationSet(this._elementIterable) {
     _elementCssStyleDeclarationSetIterable = new List.from(
         _elementIterable).map((e) => e.style);
   }
 
   String getPropertyValue(String propertyName) =>
       _elementCssStyleDeclarationSetIterable.first.getPropertyValue(
@@ skipping 14 matching lines @@
       JS('void', '#.style[#] = #', element, propertyName, value);
     }
   }
 """)
 
 
   for camelName in sorted(universal_properties):
     property = dashifyName(camelName)
     class_file.write("""
   /** Sets the value of "%s" */
-  void set %s(String value) {
+  set %s(String value) {
     _setAll('%s', value);
   }
     """ % (property, camelName, camelName))
 
   class_file.write("""
 $endif
 
   // Important note: CssStyleDeclarationSet does NOT implement every method
   // available in CssStyleDeclaration. Some of the methods don't make so much
   // sense in terms of having a resonable value to return when you're
@@ skipping 41 matching lines @@
     class_lines.append("""
   String get %s =>
     getPropertyValue('%s');
 
 """ % (camel_case_name, css_name))
 
     class_lines.append(comment % 'Sets')
     if base_css_name in annotated:
       class_lines.append(annotated[base_css_name])
     class_lines.append("""
-  void set %s(String value) {
+  set %s(String value) {
     setProperty('%s', value, '');
   }
 """ % (camel_case_name, css_name))
 
   class_file.write(''.join(class_lines));
   class_file.write('}\n')
   class_file.close()