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

Unified Diff: sky/engine/core/css/CSSStyleDeclaration.h

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « sky/engine/core/css/CSSPrimitiveValue.idl ('k') | sky/engine/core/css/CSSStyleDeclaration.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/CSSStyleDeclaration.h
diff --git a/sky/engine/core/css/CSSStyleDeclaration.h b/sky/engine/core/css/CSSStyleDeclaration.h
index 49bfdbef299a6fe4b9c8c55141aff2acd3c3efd4..3e7def20875bbfb99841e8aed87f1efb1288b2d9 100644
--- a/sky/engine/core/css/CSSStyleDeclaration.h
+++ b/sky/engine/core/css/CSSStyleDeclaration.h
@@ -22,7 +22,7 @@
#define SKY_ENGINE_CORE_CSS_CSSSTYLEDECLARATION_H_
#include "gen/sky/core/CSSPropertyNames.h"
-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"
+#include "sky/engine/tonic/dart_wrappable.h"
#include "sky/engine/wtf/Forward.h"
#include "sky/engine/wtf/Noncopyable.h"
@@ -34,7 +34,7 @@ class CSSValue;
class ExceptionState;
class MutableStylePropertySet;
-class CSSStyleDeclaration : public ScriptWrappable {
+class CSSStyleDeclaration : public DartWrappable {
DEFINE_WRAPPERTYPEINFO();
WTF_MAKE_NONCOPYABLE(CSSStyleDeclaration); WTF_MAKE_FAST_ALLOCATED;
public:
@@ -53,7 +53,7 @@ public:
virtual String getPropertyValue(const String& propertyName) = 0;
virtual String getPropertyShorthand(const String& propertyName) = 0;
virtual bool isPropertyImplicit(const String& propertyName) = 0;
- virtual void setProperty(const String& propertyName, const String& value, const String& priority, ExceptionState&) = 0;
+ virtual void setProperty(const String& propertyName, const String& value, ExceptionState&) = 0;
virtual String removeProperty(const String& propertyName, ExceptionState&) = 0;
// CSSPropertyID versions of the CSSOM functions to support bindings and editing.
« no previous file with comments | « sky/engine/core/css/CSSPrimitiveValue.idl ('k') | sky/engine/core/css/CSSStyleDeclaration.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698