Changeset 189836 in webkit

Timestamp:

Sep 15, 2015 6:31:50 PM (9 years ago)

Author:

benjamin@webkit.org

Message:

Style invalidation affecting siblings does not work with inline-style changes
​https://bugs.webkit.org/show_bug.cgi?id=149189

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2015-09-15
Reviewed by Antti Koivisto.

Source/WebCore:

Style::resolveTree() made the assumption that inline style changes only affect
descendants and should not participate in "StyleRecalcAffectsNextSiblingElementStyle".
That was wrong. If the inline style change through CSSOM, it can cause the creation
of a style attribute, which is observable through "StyleRecalcAffectsNextSiblingElementStyle".

This patch removes the incorrect assumption. Style invalidation is always propagated now.

Tests: fast/css/style-attribute-invalidation-propagates-to-counted-siblings.html

fast/css/style-attribute-invalidation-propagates-to-direct-siblings.html
fast/css/style-attribute-invalidation-propagates-to-indirect-siblings.html

• css/PropertySetCSSStyleDeclaration.cpp:

(WebCore::InlineCSSStyleDeclaration::didMutate): Deleted.

• dom/StyledElement.cpp:

(WebCore::StyledElement::inlineStyleChanged):

• dom/StyledElement.h:

(WebCore::StyledElement::invalidateStyleAttribute):
Clean up inline-style invalidation a tiny bit.

• style/StyleResolveTree.cpp:

(WebCore::Style::resolveTree):
Fix the bug.

LayoutTests:

• fast/css/style-attribute-invalidation-propagates-to-counted-siblings-expected.txt: Added.
• fast/css/style-attribute-invalidation-propagates-to-counted-siblings.html: Added.
• fast/css/style-attribute-invalidation-propagates-to-direct-siblings-expected.txt: Added.
• fast/css/style-attribute-invalidation-propagates-to-direct-siblings.html: Added.
• fast/css/style-attribute-invalidation-propagates-to-indirect-siblings-expected.txt: Added.
• fast/css/style-attribute-invalidation-propagates-to-indirect-siblings.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/style-attribute-invalidation-propagates-to-counted-siblings-expected.txt (added)
• LayoutTests/fast/css/style-attribute-invalidation-propagates-to-counted-siblings.html (added)
• LayoutTests/fast/css/style-attribute-invalidation-propagates-to-direct-siblings-expected.txt (added)
• LayoutTests/fast/css/style-attribute-invalidation-propagates-to-direct-siblings.html (added)
• LayoutTests/fast/css/style-attribute-invalidation-propagates-to-indirect-siblings-expected.txt (added)
• LayoutTests/fast/css/style-attribute-invalidation-propagates-to-indirect-siblings.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (modified) (1 diff)
• Source/WebCore/dom/StyledElement.cpp (modified) (1 diff)
• Source/WebCore/dom/StyledElement.h (modified) (1 diff)
• Source/WebCore/style/StyleResolveTree.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-09-15  Benjamin Poulain  <bpoulain@apple.com>
+
+        Style invalidation affecting siblings does not work with inline-style changes
+        https://bugs.webkit.org/show_bug.cgi?id=149189
+
+        Reviewed by Antti Koivisto.
+
+        * fast/css/style-attribute-invalidation-propagates-to-counted-siblings-expected.txt: Added.
+        * fast/css/style-attribute-invalidation-propagates-to-counted-siblings.html: Added.
+        * fast/css/style-attribute-invalidation-propagates-to-direct-siblings-expected.txt: Added.
+        * fast/css/style-attribute-invalidation-propagates-to-direct-siblings.html: Added.
+        * fast/css/style-attribute-invalidation-propagates-to-indirect-siblings-expected.txt: Added.
+        * fast/css/style-attribute-invalidation-propagates-to-indirect-siblings.html: Added.
+
 2015-09-15  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-09-15  Benjamin Poulain  <bpoulain@apple.com>
+
+        Style invalidation affecting siblings does not work with inline-style changes
+        https://bugs.webkit.org/show_bug.cgi?id=149189
+
+        Reviewed by Antti Koivisto.
+
+        Style::resolveTree() made the assumption that inline style changes only affect
+        descendants and should not participate in "StyleRecalcAffectsNextSiblingElementStyle".
+        That was wrong. If the inline style change through CSSOM, it can cause the creation
+        of a style attribute, which is observable through "StyleRecalcAffectsNextSiblingElementStyle".
+
+        This patch removes the incorrect assumption. Style invalidation is always propagated now.
+
+        Tests: fast/css/style-attribute-invalidation-propagates-to-counted-siblings.html
+               fast/css/style-attribute-invalidation-propagates-to-direct-siblings.html
+               fast/css/style-attribute-invalidation-propagates-to-indirect-siblings.html
+
+        * css/PropertySetCSSStyleDeclaration.cpp:
+        (WebCore::InlineCSSStyleDeclaration::didMutate): Deleted.
+        * dom/StyledElement.cpp:
+        (WebCore::StyledElement::inlineStyleChanged):
+        * dom/StyledElement.h:
+        (WebCore::StyledElement::invalidateStyleAttribute):
+        Clean up inline-style invalidation a tiny bit.
+
+        * style/StyleResolveTree.cpp:
+        (WebCore::Style::resolveTree):
+        Fix the bug.
+
 2015-09-15  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp

@@ -366 +366 @@
         return;
 
-    m_parentElement->setNeedsStyleRecalc(InlineStyleChange);
     m_parentElement->invalidateStyleAttribute();
     StyleAttributeMutationScope(this).didInvalidateStyleAttr();

trunk/Source/WebCore/dom/StyledElement.cpp

@@ -215 +215 @@
 void StyledElement::inlineStyleChanged()
 {
-    setNeedsStyleRecalc(InlineStyleChange);
-    ASSERT(elementData());
-    elementData()->setStyleAttributeIsDirty(true);
+    invalidateStyleAttribute();
     InspectorInstrumentation::didInvalidateStyleAttr(document(), *this);
 }

trunk/Source/WebCore/dom/StyledElement.h

@@ -98 +98 @@
     ASSERT(elementData());
     elementData()->setStyleAttributeIsDirty(true);
+    setNeedsStyleRecalc(InlineStyleChange);
 }
 

trunk/Source/WebCore/style/StyleResolveTree.cpp

@@ -821 +821 @@
                     childElement.setNeedsStyleRecalc();
                 elementNeedingStyleRecalcAffectsNextSiblingElementStyle = childElement.affectsNextSiblingElementStyle();
-            } else if (childElement.styleChangeType() >= FullStyleChange)
+            } else if (childElement.needsStyleRecalc())
                 elementNeedingStyleRecalcAffectsNextSiblingElementStyle = childElement.affectsNextSiblingElementStyle();
             if (change >= Inherit || childElement.childNeedsStyleRecalc() || childElement.needsStyleRecalc()) {