Title: [201088] trunk/Source/WebCore
- Revision
- 201088
- Author
- [email protected]
- Date
- 2016-05-18 11:59:40 -0700 (Wed, 18 May 2016)
Log Message
markAllDescendantsWithFloatsForLayout should not drill into blocks with
inline children. It was sufficient to mark ourselves as needing layout.
https://bugs.webkit.org/show_bug.cgi?id=157845
Reviewed by Simon Fraser.
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::markAllDescendantsWithFloatsForLayout):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (201087 => 201088)
--- trunk/Source/WebCore/ChangeLog 2016-05-18 18:57:33 UTC (rev 201087)
+++ trunk/Source/WebCore/ChangeLog 2016-05-18 18:59:40 UTC (rev 201088)
@@ -1,3 +1,15 @@
+2016-05-18 Dave Hyatt <[email protected]>
+
+ markAllDescendantsWithFloatsForLayout should not drill into blocks with
+ inline children. It was sufficient to mark ourselves as needing layout.
+
+ https://bugs.webkit.org/show_bug.cgi?id=157845
+
+ Reviewed by Simon Fraser.
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::markAllDescendantsWithFloatsForLayout):
+
2016-05-18 Joanmarie Diggs <[email protected]>
[GTK] accessibility/meter-element.html is failing
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (201087 => 201088)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-05-18 18:57:33 UTC (rev 201087)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-05-18 18:59:40 UTC (rev 201088)
@@ -2766,6 +2766,9 @@
if (floatToRemove)
removeFloatingObject(*floatToRemove);
+ if (childrenInline())
+ return;
+
// Iterate over our block children and mark them as needed.
for (auto& block : childrenOfType<RenderBlock>(*this)) {
if (!floatToRemove && block.isFloatingOrOutOfFlowPositioned())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
