Changeset 206404 in webkit

Timestamp:

Sep 26, 2016, 4:51:17 PM (8 years ago)

Author:

Antti Koivisto

Message:

Setter on style element's textContent or cssText doesn't trigger style recalc
​https://bugs.webkit.org/show_bug.cgi?id=160331
<rdar://problem/27609715>

Reviewed by Ryosuke Niwa and Daniel Bates.

Source/WebCore:

We would not notify the parent when text node content changed in a shadow tree.

Test: fast/shadow-dom/shadow-style-text-mutation.html

• dom/AuthorStyleSheets.cpp:

(WebCore::AuthorStyleSheets::updateActiveStyleSheets):

Invalidate shadow root children instead of the root itself when doing full invalidation.
The invalidity bits have no meaning for non-element, non-texts.

• dom/CharacterData.cpp:

(WebCore::CharacterData::parserAppendData):
(WebCore::CharacterData::setDataAndUpdate):
(WebCore::CharacterData::notifyParentAfterChange):

Add a helper and call it also in shadow trees.

(WebCore::CharacterData::dispatchModifiedEvent):

• dom/CharacterData.h:

LayoutTests:

• fast/shadow-dom/shadow-style-text-mutation-expected.html: Added.
• fast/shadow-dom/shadow-style-text-mutation.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/shadow-style-text-mutation-expected.html (added)
• LayoutTests/fast/shadow-dom/shadow-style-text-mutation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/AuthorStyleSheets.cpp (modified) (2 diffs)
• Source/WebCore/dom/CharacterData.cpp (modified) (3 diffs)
• Source/WebCore/dom/CharacterData.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-26  Antti Koivisto  <antti@apple.com>
+
+        Setter on style element's textContent or cssText doesn't trigger style recalc
+        https://bugs.webkit.org/show_bug.cgi?id=160331
+        <rdar://problem/27609715>
+
+        Reviewed by Ryosuke Niwa and Daniel Bates.
+
+        * fast/shadow-dom/shadow-style-text-mutation-expected.html: Added.
+        * fast/shadow-dom/shadow-style-text-mutation.html: Added.
+
 2016-09-26  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-26  Antti Koivisto  <antti@apple.com>
+
+        Setter on style element's textContent or cssText doesn't trigger style recalc
+        https://bugs.webkit.org/show_bug.cgi?id=160331
+        <rdar://problem/27609715>
+
+        Reviewed by Ryosuke Niwa and Daniel Bates.
+
+        We would not notify the parent when text node content changed in a shadow tree.
+
+        Test: fast/shadow-dom/shadow-style-text-mutation.html
+
+        * dom/AuthorStyleSheets.cpp:
+        (WebCore::AuthorStyleSheets::updateActiveStyleSheets):
+
+            Invalidate shadow root children instead of the root itself when doing full invalidation.
+            The invalidity bits have no meaning for non-element, non-texts.
+
+        * dom/CharacterData.cpp:
+        (WebCore::CharacterData::parserAppendData):
+        (WebCore::CharacterData::setDataAndUpdate):
+        (WebCore::CharacterData::notifyParentAfterChange):
+
+            Add a helper and call it also in shadow trees.
+
+        (WebCore::CharacterData::dispatchModifiedEvent):
+        * dom/CharacterData.h:
+
 2016-09-26  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/dom/AuthorStyleSheets.cpp

@@ -31 +31 @@
 #include "CSSStyleSheet.h"
 #include "Element.h"
+#include "ElementChildIterator.h"
 #include "ExtensionStyleSheets.h"
 #include "HTMLIFrameElement.h"
@@ -337 +338 @@
 
     if (requiresFullStyleRecalc) {
-        if (m_shadowRoot)
-            m_shadowRoot->setNeedsStyleRecalc();
-        else
+        if (m_shadowRoot) {
+            for (auto& shadowChild : childrenOfType<Element>(*m_shadowRoot))
+                shadowChild.setNeedsStyleRecalc();
+        } else
             m_document.scheduleForcedStyleRecalc();
     }

trunk/Source/WebCore/dom/CharacterData.cpp

@@ -104 +104 @@
         downcast<Text>(*this).updateRendererAfterContentChange(oldLength, 0);
 
-    document().incDOMTreeVersion();
-    // We don't call dispatchModifiedEvent here because we don't want the
-    // parser to dispatch DOM mutation events.
-    if (parentNode()) {
-        ContainerNode::ChildChange change = {
-            ContainerNode::TextChanged,
-            ElementTraversal::previousSibling(*this),
-            ElementTraversal::nextSibling(*this),
-            ContainerNode::ChildChangeSourceParser
-        };
-        parentNode()->childrenChanged(change);
-    }
+    notifyParentAfterChange(ContainerNode::ChildChangeSourceParser);
 
     return characterLengthLimit;
@@ -209 +198 @@
         document().frame()->selection().textWasReplaced(this, offsetOfReplacedData, oldLength, newLength);
 
+    notifyParentAfterChange(ContainerNode::ChildChangeSourceAPI);
+
+    dispatchModifiedEvent(oldData);
+}
+
+void CharacterData::notifyParentAfterChange(ContainerNode::ChildChangeSource source)
+{
     document().incDOMTreeVersion();
-    dispatchModifiedEvent(oldData);
+
+    if (!parentNode())
+        return;
+
+    ContainerNode::ChildChange change = {
+        ContainerNode::TextChanged,
+        ElementTraversal::previousSibling(*this),
+        ElementTraversal::nextSibling(*this),
+        source
+    };
+    parentNode()->childrenChanged(change);
 }
 
@@ -219 +225 @@
 
     if (!isInShadowTree()) {
-        if (parentNode()) {
-            ContainerNode::ChildChange change = {
-                ContainerNode::TextChanged,
-                ElementTraversal::previousSibling(*this),
-                ElementTraversal::nextSibling(*this),
-                ContainerNode::ChildChangeSourceAPI
-            };
-            parentNode()->childrenChanged(change);
-        }
         if (document().hasListenerType(Document::DOMCHARACTERDATAMODIFIED_LISTENER))
             dispatchScopedEvent(MutationEvent::create(eventNames().DOMCharacterDataModifiedEvent, true, nullptr, oldData, m_data));

trunk/Source/WebCore/dom/CharacterData.h

@@ -23 +23 @@
 #pragma once
 
-#include "Node.h"
+#include "ContainerNode.h"
 #include <wtf/text/WTFString.h>
 
@@ -70 +70 @@
     void setDataAndUpdate(const String&, unsigned offsetOfReplacedData, unsigned oldLength, unsigned newLength);
     void checkCharDataOperation(unsigned offset, ExceptionCode&);
+    void notifyParentAfterChange(ContainerNode::ChildChangeSource);
 
     String m_data;