Fix CSSPropertySetterGetterMethods regression

third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.h

Index: third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.h
diff --git a/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.h b/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.h
index d35e39727f5a47578f4a65fcabd8788229caad49..a1ce7b9a1d11aaef7b65f28d34b2045a230067f5 100644
--- a/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.h
+++ b/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.h
@@ -36,6 +36,7 @@ class CSSValue;
 class Element;
 class ExceptionState;
 class MutableStylePropertySet;
+class PropertyRegistry;
 class StyleSheetContents;
 
 class AbstractPropertySetCSSStyleDeclaration : public CSSStyleDeclaration {
@@ -53,8 +54,7 @@ class AbstractPropertySetCSSStyleDeclaration : public CSSStyleDeclaration {
   String getPropertyPriority(const String& propertyName) final;
   String getPropertyShorthand(const String& propertyName) final;
   bool isPropertyImplicit(const String& propertyName) final;
-  void setProperty(const ExecutionContext*,
-                   const String& propertyName,
+  void setProperty(const String& propertyName,
                    const String& value,
                    const String& priority,
                    ExceptionState&) final;
@@ -71,7 +71,6 @@ class AbstractPropertySetCSSStyleDeclaration : public CSSStyleDeclaration {
                            const String& customPropertyName,
                            const String& value,
                            bool important,
-                           const ExecutionContext*,
                            ExceptionState&) final;
 
   bool cssPropertyMatches(CSSPropertyID, const CSSValue*) const final;
@@ -81,6 +80,7 @@ class AbstractPropertySetCSSStyleDeclaration : public CSSStyleDeclaration {
   virtual void willMutate() {}
   virtual void didMutate(MutationType) {}
   virtual MutableStylePropertySet& propertySet() const = 0;
+  virtual PropertyRegistry* propertyRegistry() const = 0;
   virtual bool isKeyframeStyle() const { return false; }
 };
 
@@ -98,6 +98,8 @@ class PropertySetCSSStyleDeclaration
     return *m_propertySet;
   }
 
+  PropertyRegistry* propertyRegistry() const override { return nullptr; }

[Timothy Loh, 2017/01/12 04:44:41]

This is because for some reason we create PropertySetCSSStyleDeclaration objects
from MutableStylePropertySet::ensureCSSStyleDeclaration(), which is called by
editing and by the inspector (only for attribute style, so no custom
properties). It seems like editing doesn't do anything that will need this but
I'm not entirely sure.

+
   Member<MutableStylePropertySet> m_propertySet;  // Cannot be null
 };
 
@@ -123,6 +125,7 @@ class StyleRuleCSSStyleDeclaration : public PropertySetCSSStyleDeclaration {
 
   void willMutate() override;
   void didMutate(MutationType) override;
+  PropertyRegistry* propertyRegistry() const final;
 
   Member<CSSRule> m_parentRule;
 };
@@ -141,6 +144,7 @@ class InlineCSSStyleDeclaration final
   Element* parentElement() const override { return m_parentElement; }
 
   void didMutate(MutationType) override;
+  PropertyRegistry* propertyRegistry() const final;
 
   Member<Element> m_parentElement;
 };