| Index: third_party/WebKit/Source/core/css/CSSStyleDeclaration.h
|
| diff --git a/third_party/WebKit/Source/core/css/CSSStyleDeclaration.h b/third_party/WebKit/Source/core/css/CSSStyleDeclaration.h
|
| index e86d46f9624c6f48bf3332be5271da3f1676dd16..bc136ceb746965ac612d1dd8a97edf97b81031e2 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSStyleDeclaration.h
|
| +++ b/third_party/WebKit/Source/core/css/CSSStyleDeclaration.h
|
| @@ -34,6 +34,7 @@ class CSSRule;
|
| class CSSStyleSheet;
|
| class CSSValue;
|
| class ExceptionState;
|
| +class ExecutionContext;
|
|
|
| class CORE_EXPORT CSSStyleDeclaration
|
| : public GarbageCollectedFinalized<CSSStyleDeclaration>,
|
| @@ -47,7 +48,7 @@ class CORE_EXPORT CSSStyleDeclaration
|
| virtual CSSRule* parentRule() const = 0;
|
| String cssFloat() { return getPropertyValueInternal(CSSPropertyFloat); }
|
| void setCSSFloat(const String& value, ExceptionState& exceptionState) {
|
| - setPropertyInternal(CSSPropertyFloat, String(), value, false,
|
| + setPropertyInternal(CSSPropertyFloat, String(), value, false, nullptr,
|
| exceptionState);
|
| }
|
| virtual String cssText() const = 0;
|
| @@ -58,7 +59,8 @@ class CORE_EXPORT CSSStyleDeclaration
|
| virtual String getPropertyPriority(const String& propertyName) = 0;
|
| virtual String getPropertyShorthand(const String& propertyName) = 0;
|
| virtual bool isPropertyImplicit(const String& propertyName) = 0;
|
| - virtual void setProperty(const String& propertyName,
|
| + virtual void setProperty(const ExecutionContext*,
|
| + const String& propertyName,
|
| const String& value,
|
| const String& priority,
|
| ExceptionState&) = 0;
|
| @@ -78,6 +80,7 @@ class CORE_EXPORT CSSStyleDeclaration
|
| const String& propertyValue,
|
| const String& value,
|
| bool important,
|
| + const ExecutionContext*,
|
| ExceptionState&) = 0;
|
|
|
| virtual bool cssPropertyMatches(CSSPropertyID, const CSSValue*) const = 0;
|
|
|