Chromium Code Reviews| Index: tools/dom/scripts/css_code_generator.py |
| diff --git a/tools/dom/scripts/css_code_generator.py b/tools/dom/scripts/css_code_generator.py |
| index fc437dd3c9c46672a542e0c91fd39e52363eb0f7..3a00dde0224a1ba904d292e704a7c52fec73ce4e 100644 |
| --- a/tools/dom/scripts/css_code_generator.py |
| +++ b/tools/dom/scripts/css_code_generator.py |
| @@ -102,8 +102,18 @@ part of $LIBRARYNAME; |
| 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) { |
| @@ -150,10 +160,14 @@ $else |
| return _hasProperty(propertyName); |
| $endif |
| } |
| -$if DARTIUM |
| +$if DARTIUM |
| bool _hasProperty(String propertyName) => |
| + $if JSINTEROP |
| + _blink.BlinkCSSStyleDeclaration.instance.$__propertyQuery___Callback_1_(unwrap_jso(this), propertyName) != null; |
| + $else |
| _blink.BlinkCSSStyleDeclaration.$__propertyQuery___Callback_1(this, propertyName); |
| + $endif |
| $endif |
| @DomName('CSSStyleDeclaration.setProperty') |
| @@ -252,7 +266,15 @@ $if DART2JS |
| $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; |
| @@ -302,9 +324,23 @@ $endif |
| // items in the MEMBERS set if you want that functionality. |
| } |
| +$if DART2JS |
|
vsm
2015/07/08 20:01:58
Perhaps hoist JSINTEROP out to get rid of redundan
terry
2015/07/13 16:38:13
Must have lost his comment (forgot to hit save).
|
| abstract class CssStyleDeclarationBase { |
| String getPropertyValue(String propertyName); |
| void setProperty(String propertyName, String value, [String priority]); |
| +$else |
| + $if JSINTEROP |
| +class CssStyleDeclarationBase { |
|
vsm
2015/07/08 20:01:58
Keep class abstract?
terry
2015/07/13 16:31:22
Can't do it I need to construct CssStyleDeclaratio
|
| + String getPropertyValue(String propertyName) => |
| + throw new StateError('getProperty not overridden in dart:html'); |
| + void setProperty(String propertyName, String value, [String priority]) => |
| + throw new StateError('setProperty not overridden in dart:html'); |
| + $else |
| +abstract class CssStyleDeclarationBase { |
| + String getPropertyValue(String propertyName); |
| + void setProperty(String propertyName, String value, [String priority]); |
| + $endif |
| +$endif |
| """) |
| class_lines = []; |