Changeset 267722 in webkit

Timestamp:

Sep 28, 2020, 5:38:18 PM (6 years ago)

Author:

Alan Coon

Message:

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

Integrator's note: as some of the symbols present on trunk are not available on branch, special modifications had to be made to this cherry-pick to build.

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

Location:

branches/safari-610-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (2 diffs)

branches/safari-610-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-28  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r266899. rdar://problem/69586659
+
+    Integrator's note: as some of the symbols present on trunk are not available on branch, special modifications had to be made to this cherry-pick to build.
+    
+    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  <wenson_hsieh@apple.com>
+
+            Integrator's note: as some of the symbols present on trunk are not available on branch, special modifications
+            had to be made to this cherry-pick.
+
+            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-28  Alan Coon  <alancoon@apple.com>
 

branches/safari-610-branch/Source/WebCore/dom/Element.cpp

@@ -1948 +1948 @@
     // FIXME: This flag should be set whenever styles are invalidated while computed styles are present,
     // not just in this codepath.
-    if (hasRareData() && elementRareData()->computedStyle())
-        setFlag(IsComputedStyleInvalidFlag);
+    setFlag(IsComputedStyleInvalidFlag);
 }
 
@@ -2000 +1999 @@
     ASSERT(!renderer() || isPseudoElement());
     ensureElementRareData().setComputedStyle(WTFMove(style));
+    clearFlag(IsComputedStyleInvalidFlag);
 }