Title: [201186] trunk/Source/WebCore
- Revision
- 201186
- Author
- [email protected]
- Date
- 2016-05-19 14:51:31 -0700 (Thu, 19 May 2016)
Log Message
Fix childrenInline() check in markAllDescendantsWithFloatsForLayout()
https://bugs.webkit.org/show_bug.cgi?id=157866
Reviewed by Zalan Bujtas.
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::markAllDescendantsWithFloatsForLayout):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (201185 => 201186)
--- trunk/Source/WebCore/ChangeLog 2016-05-19 21:46:07 UTC (rev 201185)
+++ trunk/Source/WebCore/ChangeLog 2016-05-19 21:51:31 UTC (rev 201186)
@@ -1,3 +1,13 @@
+2016-05-19 Dave Hyatt <[email protected]>
+
+ 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 <[email protected]>
Update RenderBlockFlow::adjustComputedFontSizes() to use RenderObjectTraversal
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (201185 => 201186)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-05-19 21:46:07 UTC (rev 201185)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-05-19 21:51:31 UTC (rev 201186)
@@ -2765,8 +2765,7 @@
if (floatToRemove)
removeFloatingObject(*floatToRemove);
-
- if (childrenInline())
+ else if (childrenInline())
return;
// Iterate over our block children and mark them as needed.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
