Changeset 208176 in webkit

Timestamp:

Oct 31, 2016 2:47:30 PM (7 years ago)

Author:

rniwa@webkit.org

Message:

CSSStyleDeclaration should be annotated with CEReactions
​https://bugs.webkit.org/show_bug.cgi?id=163968

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

Rebaselined the test now that all test cases pass.

• web-platform-tests/custom-elements/attribute-changed-callback-expected.txt:

Source/WebCore:

Added CEReactions to CSSStyleDeclaration.idl.

Test: fast/custom-elements/reactions/CSSStyleDeclaration.html

• bindings/js/JSCSSStyleDeclarationCustom.cpp:

(WebCore::JSCSSStyleDeclaration::putDelegate):

• css/CSSStyleDeclaration.idl:
• css/PropertySetCSSStyleDeclaration.cpp:

(WebCore::StyleAttributeMutationScope::StyleAttributeMutationScope): Remember the old value when this is
an inline style declaration for a custom element. Also store m_oldValue and m_customElement instead of
a mutation record so that we don't create a superfluous mutation record for custom elements.
(WebCore::StyleAttributeMutationScope::~StyleAttributeMutationScope): Enqueue attributeChangedCallback
when m_customElement is not null.

• dom/CustomElementReactionQueue.cpp:

(WebCore::CustomElementReactionQueue::observesStyleAttribute):

• dom/CustomElementReactionQueue.h:

LayoutTests:

Added a W3C style testharness.js test.

• fast/custom-elements/reactions/CSSStyleDeclaration-expected.txt: Added.
• fast/custom-elements/reactions/CSSStyleDeclaration.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/custom-elements/reactions/CSSStyleDeclaration-expected.txt (added)
• LayoutTests/fast/custom-elements/reactions/CSSStyleDeclaration.html (added)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/custom-elements/attribute-changed-callback-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp (modified) (2 diffs)
• Source/WebCore/css/CSSStyleDeclaration.idl (modified) (1 diff)
• Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (modified) (5 diffs)
• Source/WebCore/dom/CustomElementReactionQueue.cpp (modified) (2 diffs)
• Source/WebCore/dom/CustomElementReactionQueue.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-31  Ryosuke Niwa  <rniwa@webkit.org>
+
+        CSSStyleDeclaration should be annotated with CEReactions
+        https://bugs.webkit.org/show_bug.cgi?id=163968
+
+        Reviewed by Antti Koivisto.
+
+        Added a W3C style testharness.js test.
+
+        * fast/custom-elements/reactions/CSSStyleDeclaration-expected.txt: Added.
+        * fast/custom-elements/reactions/CSSStyleDeclaration.html: Added.
+
 2016-10-31  Zalan Bujtas  <zalan@apple.com>
 

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2016-10-31  Ryosuke Niwa  <rniwa@webkit.org>
+
+        CSSStyleDeclaration should be annotated with CEReactions
+        https://bugs.webkit.org/show_bug.cgi?id=163968
+
+        Reviewed by Antti Koivisto.
+
+        Rebaselined the test now that all test cases pass.
+
+        * web-platform-tests/custom-elements/attribute-changed-callback-expected.txt:
+
 2016-10-28  Darin Adler  <darin@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/custom-elements/attribute-changed-callback-expected.txt

@@ -8 +8 @@
 PASS Mutating observedAttributes after calling customElements.define must not affect the set of attributes for which attributedChangedCallback is invoked 
 PASS attributedChangedCallback must be enqueued for attributes specified in a non-Array iterable observedAttributes 
-FAIL attributedChangedCallback must be enqueued for style attribute change by mutating inline style declaration assert_equals: expected 1 but got 0
+PASS attributedChangedCallback must be enqueued for style attribute change by mutating inline style declaration 
 PASS attributedChangedCallback must not be enqueued when mutating inline style declaration if the style attribute is not observed 
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-31  Ryosuke Niwa  <rniwa@webkit.org>
+
+        CSSStyleDeclaration should be annotated with CEReactions
+        https://bugs.webkit.org/show_bug.cgi?id=163968
+
+        Reviewed by Antti Koivisto.
+
+        Added CEReactions to CSSStyleDeclaration.idl.
+
+        Test: fast/custom-elements/reactions/CSSStyleDeclaration.html
+
+        * bindings/js/JSCSSStyleDeclarationCustom.cpp:
+        (WebCore::JSCSSStyleDeclaration::putDelegate):
+        * css/CSSStyleDeclaration.idl:
+        * css/PropertySetCSSStyleDeclaration.cpp:
+        (WebCore::StyleAttributeMutationScope::StyleAttributeMutationScope): Remember the old value when this is
+        an inline style declaration for a custom element. Also store m_oldValue and m_customElement instead of
+        a mutation record so that we don't create a superfluous mutation record for custom elements.
+        (WebCore::StyleAttributeMutationScope::~StyleAttributeMutationScope): Enqueue attributeChangedCallback
+        when m_customElement is not null.
+        * dom/CustomElementReactionQueue.cpp:
+        (WebCore::CustomElementReactionQueue::observesStyleAttribute):
+        * dom/CustomElementReactionQueue.h:
+
 2016-10-31  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp

@@ -34 +34 @@
 #include "CSSStyleSheet.h"
 #include "CSSValue.h"
+#include "CustomElementReactionQueue.h"
 #include "HashTools.h"
 #include "JSCSSStyleDeclaration.h"
@@ -323 +324 @@
 bool JSCSSStyleDeclaration::putDelegate(ExecState* state, PropertyName propertyName, JSValue value, PutPropertySlot&, bool& putResult)
 {
+#if ENABLE(CUSTOM_ELEMENTS)
+    CustomElementReactionStack customElementReactionStack;
+#endif
     auto propertyInfo = parseJavaScriptCSSPropertyName(propertyName);
     if (!propertyInfo.propertyID)

trunk/Source/WebCore/css/CSSStyleDeclaration.idl

@@ -29 +29 @@
     SkipVTableValidation,
 ] interface CSSStyleDeclaration {
-    [SetterMayThrowException] attribute DOMString cssText;
+    [CEReactions, SetterMayThrowException] attribute DOMString cssText;
 
     DOMString getPropertyValue(DOMString propertyName);
     [Custom] CSSValue? getPropertyCSSValue(DOMString propertyName);
 
-    [MayThrowException] DOMString removeProperty(DOMString propertyName);
+    [CEReactions, MayThrowException] DOMString removeProperty(DOMString propertyName);
     DOMString? getPropertyPriority(DOMString propertyName);
 
-    [MayThrowException] void setProperty(DOMString propertyName, [TreatNullAs=EmptyString] DOMString value, [TreatNullAs=EmptyString] optional DOMString priority = "");
+    [CEReactions, MayThrowException] void setProperty(DOMString propertyName, [TreatNullAs=EmptyString] DOMString value, [TreatNullAs=EmptyString] optional DOMString priority = "");
 
     readonly attribute unsigned long length;

trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp

@@ -27 +27 @@
 #include "CSSRule.h"
 #include "CSSStyleSheet.h"
+#include "CustomElementReactionQueue.h"
 #include "HTMLNames.h"
 #include "InspectorInstrumentation.h"
@@ -54 +55 @@
         s_currentDecl = decl;
 
-        if (!s_currentDecl->parentElement())
+        auto* element = s_currentDecl->parentElement();
+        if (!element)
             return;
 
@@ -63 +65 @@
             shouldReadOldValue = true;
 
-        AtomicString oldValue;
+#if ENABLE(CUSTOM_ELEMENTS)
+        if (UNLIKELY(element->isDefinedCustomElement())) {
+            auto* reactionQueue = element->reactionQueue();
+            if (reactionQueue && reactionQueue->observesStyleAttribute()) {
+                m_customElement = element;
+                shouldReadOldValue = true;
+            }
+        }
+#endif
+
         if (shouldReadOldValue)
-            oldValue = s_currentDecl->parentElement()->getAttribute(HTMLNames::styleAttr);
-
-        if (m_mutationRecipients) {
-            AtomicString requestedOldValue = m_mutationRecipients->isOldValueRequested() ? oldValue : nullAtom;
-            m_mutation = MutationRecord::createAttributes(*s_currentDecl->parentElement(), HTMLNames::styleAttr, requestedOldValue);
-        }
+            m_oldValue = s_currentDecl->parentElement()->getAttribute(HTMLNames::styleAttr);
     }
 
@@ -79 +85 @@
             return;
 
-        if (m_mutation && s_shouldDeliver)
-            m_mutationRecipients->enqueueMutationRecord(m_mutation.releaseNonNull());
+        if (s_shouldDeliver) {
+            if (m_mutationRecipients) {
+                auto mutation = MutationRecord::createAttributes(*s_currentDecl->parentElement(), HTMLNames::styleAttr, m_oldValue);
+                m_mutationRecipients->enqueueMutationRecord(WTFMove(mutation));
+            }
+            if (m_customElement) {
+                AtomicString newValue = m_customElement->getAttribute(HTMLNames::styleAttr);
+                CustomElementReactionQueue::enqueueAttributeChangedCallbackIfNeeded(*m_customElement, HTMLNames::styleAttr, m_oldValue, newValue);
+            }
+        }
 
         s_shouldDeliver = false;
@@ -112 +126 @@
 
     std::unique_ptr<MutationObserverInterestGroup> m_mutationRecipients;
-    RefPtr<MutationRecord> m_mutation;
+    AtomicString m_oldValue;
+    RefPtr<Element> m_customElement;
 };
 

trunk/Source/WebCore/dom/CustomElementReactionQueue.cpp

@@ -33 +33 @@
 #include "Document.h"
 #include "Element.h"
+#include "HTMLNames.h"
 #include "JSCustomElementInterface.h"
 #include "JSDOMBinding.h"
@@ -191 +192 @@
 }
 
+bool CustomElementReactionQueue::observesStyleAttribute() const
+{
+    return m_interface->observesAttribute(HTMLNames::styleAttr.localName());
+}
+
 void CustomElementReactionQueue::invokeAll(Element& element)
 {

trunk/Source/WebCore/dom/CustomElementReactionQueue.h

@@ -54 +54 @@
     static void enqueuePostUpgradeReactions(Element&);
 
+    bool observesStyleAttribute() const;
     void invokeAll(Element&);
     void clear();