Fix childrenInline() check in markAllDescendantsWithFloatsForLayout()
authorhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 May 2016 21:51:31 +0000 (21:51 +0000)
committerhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 May 2016 21:51:31 +0000 (21:51 +0000)
https://bugs.webkit.org/show_bug.cgi?id=157866

Reviewed by Zalan Bujtas.

* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::markAllDescendantsWithFloatsForLayout):

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

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlockFlow.cpp

index a63aa70..394e191 100644 (file)
@@ -1,3 +1,13 @@
+2016-05-19  Dave Hyatt  <hyatt@apple.com>
+
+        Fix childrenInline() check in markAllDescendantsWithFloatsForLayout()
+        https://bugs.webkit.org/show_bug.cgi?id=157866
+
+        Reviewed by Zalan Bujtas.
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::markAllDescendantsWithFloatsForLayout):
+
 2016-05-19  Chris Dumez  <cdumez@apple.com>
 
         Update RenderBlockFlow::adjustComputedFontSizes() to use RenderObjectTraversal
index 604f531..8950a9e 100644 (file)
@@ -2765,8 +2765,7 @@ void RenderBlockFlow::markAllDescendantsWithFloatsForLayout(RenderBox* floatToRe
 
     if (floatToRemove)
         removeFloatingObject(*floatToRemove);
-
-    if (childrenInline())
+    else if (childrenInline())
         return;
 
     // Iterate over our block children and mark them as needed.