Title: [201723] trunk/Source/WebCore
Revision
201723
Author
o...@webkit.org
Date
2016-06-06 13:19:35 -0700 (Mon, 06 Jun 2016)

Log Message

Fix the !ENABLE(SHADOW_DOM) && !ENABLE(DETAILS_ELEMENT) build
https://bugs.webkit.org/show_bug.cgi?id=158347

Reviewed by Chris Dumez.

* dom/ContainerNode.cpp:
(WebCore::destroyRenderTreeIfNeeded):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (201722 => 201723)


--- trunk/Source/WebCore/ChangeLog	2016-06-06 20:11:29 UTC (rev 201722)
+++ trunk/Source/WebCore/ChangeLog	2016-06-06 20:19:35 UTC (rev 201723)
@@ -1,3 +1,13 @@
+2016-06-06  Csaba Osztrogonác  <o...@webkit.org>
+
+        Fix the !ENABLE(SHADOW_DOM) && !ENABLE(DETAILS_ELEMENT) build
+        https://bugs.webkit.org/show_bug.cgi?id=158347
+
+        Reviewed by Chris Dumez.
+
+        * dom/ContainerNode.cpp:
+        (WebCore::destroyRenderTreeIfNeeded):
+
 2016-06-06  Alex Christensen  <achristen...@webkit.org>
 
         Remove unused ResourceResponse::platformResponseIsUpToDate

Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (201722 => 201723)


--- trunk/Source/WebCore/dom/ContainerNode.cpp	2016-06-06 20:11:29 UTC (rev 201722)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp	2016-06-06 20:19:35 UTC (rev 201723)
@@ -99,8 +99,12 @@
 
 static inline void destroyRenderTreeIfNeeded(Node& child)
 {
+    bool childIsHTMLSlotElement = false;
+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+    childIsHTMLSlotElement = is<HTMLSlotElement>(child);
+#endif
     // FIXME: Get rid of the named flow test.
-    if (!child.renderer() && !child.isNamedFlowContentNode() && !is<HTMLSlotElement>(child))
+    if (!child.renderer() && !child.isNamedFlowContentNode() && !childIsHTMLSlotElement)
         return;
     if (is<Element>(child))
         RenderTreeUpdater::tearDownRenderers(downcast<Element>(child));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to