Title: [267632] branches/safari-610-branch/Source/WebCore
Revision
267632
Author
[email protected]
Date
2020-09-26 14:08:41 -0700 (Sat, 26 Sep 2020)

Log Message

Cherry-pick r266899. rdar://problem/69586659

    Address a post-commit review comment after r266887
    https://bugs.webkit.org/show_bug.cgi?id=216257

    Reviewed by Darin Adler.

    Remove a check that currently makes us conditionally set `IsComputedStyleInvalidFlag` if there is a computed
    style in rare data. There should be no change in behavior; this just makes the code a bit simpler.

    * dom/Element.cpp:
    (WebCore::Element::invalidateStyle):
    (WebCore::Element::storeDisplayContentsStyle):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266899 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-610-branch/Source/WebCore/ChangeLog (267631 => 267632)


--- branches/safari-610-branch/Source/WebCore/ChangeLog	2020-09-26 21:08:38 UTC (rev 267631)
+++ branches/safari-610-branch/Source/WebCore/ChangeLog	2020-09-26 21:08:41 UTC (rev 267632)
@@ -1,5 +1,38 @@
 2020-09-25  Alan Coon  <[email protected]>
 
+        Cherry-pick r266899. rdar://problem/69586659
+
+    Address a post-commit review comment after r266887
+    https://bugs.webkit.org/show_bug.cgi?id=216257
+    
+    Reviewed by Darin Adler.
+    
+    Remove a check that currently makes us conditionally set `IsComputedStyleInvalidFlag` if there is a computed
+    style in rare data. There should be no change in behavior; this just makes the code a bit simpler.
+    
+    * dom/Element.cpp:
+    (WebCore::Element::invalidateStyle):
+    (WebCore::Element::storeDisplayContentsStyle):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266899 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-09-10  Wenson Hsieh  <[email protected]>
+
+            Address a post-commit review comment after r266887
+            https://bugs.webkit.org/show_bug.cgi?id=216257
+
+            Reviewed by Darin Adler.
+
+            Remove a check that currently makes us conditionally set `IsComputedStyleInvalidFlag` if there is a computed
+            style in rare data. There should be no change in behavior; this just makes the code a bit simpler.
+
+            * dom/Element.cpp:
+            (WebCore::Element::invalidateStyle):
+            (WebCore::Element::storeDisplayContentsStyle):
+
+2020-09-25  Alan Coon  <[email protected]>
+
         Cherry-pick r266887. rdar://problem/69586659
 
     REGRESSION (r257839): clickpay.com - password placeholder text cannot be replaced

Modified: branches/safari-610-branch/Source/WebCore/dom/Element.cpp (267631 => 267632)


--- branches/safari-610-branch/Source/WebCore/dom/Element.cpp	2020-09-26 21:08:38 UTC (rev 267631)
+++ branches/safari-610-branch/Source/WebCore/dom/Element.cpp	2020-09-26 21:08:41 UTC (rev 267632)
@@ -1947,8 +1947,7 @@
 
     // FIXME: This flag should be set whenever styles are invalidated while computed styles are present,
     // not just in this codepath.
-    if (hasRareData() && elementRareData()->computedStyle())
-        setNodeFlag(NodeFlag::IsComputedStyleInvalidFlag);
+    setNodeFlag(NodeFlag::IsComputedStyleInvalidFlag);
 }
 
 void Element::invalidateStyleAndLayerComposition()
@@ -1999,6 +1998,7 @@
     ASSERT(style && style->display() == DisplayType::Contents);
     ASSERT(!renderer() || isPseudoElement());
     ensureElementRareData().setComputedStyle(WTFMove(style));
+    clearNodeFlag(NodeFlag::IsComputedStyleInvalidFlag);
 }
 
 // Returns true is the given attribute is an event handler.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to