Title: [177049] trunk
- Revision
- 177049
- Author
- bjone...@adobe.com
- Date
- 2014-12-09 16:57:10 -0800 (Tue, 09 Dec 2014)
Log Message
REGRESSION(r155906): Page content disappears on Tuaw article after loading
https://bugs.webkit.org/show_bug.cgi?id=138100
Reviewed by Simon Fraser.
.:
DRT causes an extra paint which makes it impossible to test this with
an automated test.
* ManualTests/float-layer-not-painting.html: Added.
Source/WebCore:
Test: ManualTests/float-layer-not-painting.html
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::insertFloatingObject): If a layout happens,
it can change whether the float's renderer has a self painting layer.
So in that case, we need to update the flag on the FloatingObject
instance for that float.
Modified Paths
Diff
Modified: trunk/ChangeLog (177048 => 177049)
--- trunk/ChangeLog 2014-12-10 00:47:51 UTC (rev 177048)
+++ trunk/ChangeLog 2014-12-10 00:57:10 UTC (rev 177049)
@@ -1,3 +1,15 @@
+2014-12-09 Bem Jones-Bey <bjone...@adobe.com>
+
+ REGRESSION(r155906): Page content disappears on Tuaw article after loading
+ https://bugs.webkit.org/show_bug.cgi?id=138100
+
+ Reviewed by Simon Fraser.
+
+ DRT causes an extra paint which makes it impossible to test this with
+ an automated test.
+
+ * ManualTests/float-layer-not-painting.html: Added.
+
2014-12-07 Alberto Garcia <be...@igalia.com>
[GTK] WebKit has a new required dependency on GnuTLS
Modified: trunk/Source/WebCore/ChangeLog (177048 => 177049)
--- trunk/Source/WebCore/ChangeLog 2014-12-10 00:47:51 UTC (rev 177048)
+++ trunk/Source/WebCore/ChangeLog 2014-12-10 00:57:10 UTC (rev 177049)
@@ -1,3 +1,18 @@
+2014-12-09 Bem Jones-Bey <bjone...@adobe.com>
+
+ REGRESSION(r155906): Page content disappears on Tuaw article after loading
+ https://bugs.webkit.org/show_bug.cgi?id=138100
+
+ Reviewed by Simon Fraser.
+
+ Test: ManualTests/float-layer-not-painting.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::insertFloatingObject): If a layout happens,
+ it can change whether the float's renderer has a self painting layer.
+ So in that case, we need to update the flag on the FloatingObject
+ instance for that float.
+
2014-12-09 Andreas Kling <akl...@apple.com>
Roll out r165076.
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (177048 => 177049)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-12-10 00:47:51 UTC (rev 177048)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-12-10 00:57:10 UTC (rev 177049)
@@ -2217,8 +2217,11 @@
floatBox.setChildNeedsLayout(MarkOnlyThis);
bool needsBlockDirectionLocationSetBeforeLayout = isChildRenderBlock && view().layoutState()->needsBlockDirectionLocationSetBeforeLayout();
- if (!needsBlockDirectionLocationSetBeforeLayout || isWritingModeRoot()) // We are unsplittable if we're a block flow root.
+ if (!needsBlockDirectionLocationSetBeforeLayout || isWritingModeRoot()) {
+ // We are unsplittable if we're a block flow root.
floatBox.layoutIfNeeded();
+ floatingObject->setShouldPaint(!floatBox.hasSelfPaintingLayer());
+ }
else {
floatBox.updateLogicalWidth();
floatBox.computeAndSetBlockDirectionMargins(this);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
