Changeset 222168 in webkit

Timestamp:

Sep 18, 2017 11:26:57 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Always update display: contents styles in RenderTreeUpdater.
​https://bugs.webkit.org/show_bug.cgi?id=177065

Patch by Emilio Cobos Álvarez <emilio> on 2017-09-18
Reviewed by Antti Koivisto.

Source/WebCore:

Otherwise we keep an old style around, making following style updates wrong.

Test: fast/css/display-contents-style-update.html

• style/RenderTreeUpdater.cpp:

(WebCore::RenderTreeUpdater::updateElementRenderer):

LayoutTests:

• fast/css/display-contents-style-update-expected.html: Added.
• fast/css/display-contents-style-update.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt (modified) (1 diff)
• LayoutTests/fast/css/display-contents-style-update-expected.html (added)
• LayoutTests/fast/css/display-contents-style-update.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/RenderTreeUpdater.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-09-18  Emilio Cobos Álvarez  <emilio@crisal.io>
+
+        Always update display: contents styles in RenderTreeUpdater.
+        https://bugs.webkit.org/show_bug.cgi?id=177065
+
+        Reviewed by Antti Koivisto.
+
+        * fast/css/display-contents-style-update-expected.html: Added.
+        * fast/css/display-contents-style-update.html: Added.
+
 2017-09-18  Antti Koivisto  <antti@apple.com>
 

trunk/LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt

@@ -1 +1 @@
 Pass.
 WebKit didn't Crash.
-

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-09-18  Emilio Cobos Álvarez  <emilio@crisal.io>
+
+        Always update display: contents styles in RenderTreeUpdater.
+        https://bugs.webkit.org/show_bug.cgi?id=177065
+
+        Reviewed by Antti Koivisto.
+
+        Otherwise we keep an old style around, making following style updates wrong.
+
+        Test: fast/css/display-contents-style-update.html
+
+        * style/RenderTreeUpdater.cpp:
+        (WebCore::RenderTreeUpdater::updateElementRenderer):
+
 2017-09-18  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/style/RenderTreeUpdater.cpp

@@ -315 +315 @@
 
     bool hasDisplayContents = update.style->display() == CONTENTS;
-    if (hasDisplayContents != element.hasDisplayContents()) {
-        if (!hasDisplayContents)
-            element.resetComputedStyle();
-        else
-            element.storeDisplayContentsStyle(RenderStyle::clonePtr(*update.style));
-    }
+    if (hasDisplayContents)
+        element.storeDisplayContentsStyle(RenderStyle::clonePtr(*update.style));
+    else
+        element.resetComputedStyle();
 
     bool shouldCreateNewRenderer = !element.renderer() && !hasDisplayContents;