Changeset 214804 in webkit

Timestamp:

Apr 3, 2017 9:53:11 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r214501 - Missing render tree position invalidation when tearing down renderers for display:contents subtree
​https://bugs.webkit.org/show_bug.cgi?id=170199
<rdar://problem/31260856>

Reviewed by Zalan Bujtas.

Source/WebCore:

Test: fast/shadow-dom/slot-renderer-teardown.html

• style/RenderTreeUpdater.cpp:

(WebCore::RenderTreeUpdater::updateElementRenderer):

Invalidate the render tree position in case we do a teardown for an element without renderer.

LayoutTests:

• fast/shadow-dom/slot-renderer-teardown-expected.txt: Added.
• fast/shadow-dom/slot-renderer-teardown.html: Added.

Location:

releases/WebKitGTK/webkit-2.16

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/slot-renderer-teardown-expected.txt (added)
• LayoutTests/fast/shadow-dom/slot-renderer-teardown.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/RenderTreeUpdater.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog

@@ +1 @@
+2017-03-28  Antti Koivisto  <antti@apple.com>
+
+        Missing render tree position invalidation when tearing down renderers for display:contents subtree
+        https://bugs.webkit.org/show_bug.cgi?id=170199
+        <rdar://problem/31260856>
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/shadow-dom/slot-renderer-teardown-expected.txt: Added.
+        * fast/shadow-dom/slot-renderer-teardown.html: Added.
+
 2017-03-22  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-28  Antti Koivisto  <antti@apple.com>
+
+        Missing render tree position invalidation when tearing down renderers for display:contents subtree
+        https://bugs.webkit.org/show_bug.cgi?id=170199
+        <rdar://problem/31260856>
+
+        Reviewed by Zalan Bujtas.
+
+        Test: fast/shadow-dom/slot-renderer-teardown.html
+
+        * style/RenderTreeUpdater.cpp:
+        (WebCore::RenderTreeUpdater::updateElementRenderer):
+
+            Invalidate the render tree position in case we do a teardown for an element without renderer.
+
 2017-03-24  Daniel Bates  <dabates@apple.com>
 

releases/WebKitGTK/webkit-2.16/Source/WebCore/style/RenderTreeUpdater.cpp

@@ -257 +257 @@
     bool shouldTearDownRenderers = update.change == Style::Detach
         && (element.renderer() || element.isNamedFlowContentElement() || element.hasDisplayContents());
-    if (shouldTearDownRenderers)
+    if (shouldTearDownRenderers) {
+        if (!element.renderer()) {
+            // We may be tearing down a descendant renderer cached in renderTreePosition.
+            renderTreePosition().invalidateNextSibling();
+        }
         tearDownRenderers(element, TeardownType::KeepHoverAndActive);
+    }
 
     bool hasDisplayContents = update.style->display() == CONTENTS;