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

Unified Diff: sky/engine/core/css/CSSComputedStyleDeclaration.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/core.gni ('k') | sky/engine/core/css/CSSComputedStyleDeclaration.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/CSSComputedStyleDeclaration.h
diff --git a/sky/engine/core/css/CSSComputedStyleDeclaration.h b/sky/engine/core/css/CSSComputedStyleDeclaration.h
index 5a63dbae7a27f2d95abbf0d0bcc39271e2b967f2..1829852885f2d1150cf2faf90ae5e77b56bc14f6 100644
--- a/sky/engine/core/css/CSSComputedStyleDeclaration.h
+++ b/sky/engine/core/css/CSSComputedStyleDeclaration.h
@@ -81,7 +81,7 @@ private:
virtual String getPropertyValue(const String& propertyName) override;
virtual String getPropertyShorthand(const String& propertyName) override;
virtual bool isPropertyImplicit(const String& propertyName) override;
- virtual void setProperty(const String& propertyName, const String& value, const String& priority, ExceptionState&) override;
+ virtual void setProperty(const String& propertyName, const String& value, ExceptionState&) override;
virtual String removeProperty(const String& propertyName, ExceptionState&) override;
virtual String cssText() const override;
virtual void setCSSText(const String&, ExceptionState&) override;
« no previous file with comments | « sky/engine/core/core.gni ('k') | sky/engine/core/css/CSSComputedStyleDeclaration.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698