Title: [137841] trunk/Source/WebCore
- Revision
- 137841
- Author
- [email protected]
- Date
- 2012-12-16 10:14:52 -0800 (Sun, 16 Dec 2012)
Log Message
Fix assertions when doing a full repaint of compositing layers
https://bugs.webkit.org/show_bug.cgi?id=105128
Reviewed by Dan Bernstein.
In r137811 I added code to repaint all compositing layers when FrameView::layout()
is doing a full repaint. However, this code needs to avoid calling setContentsNeedDisplay()
on layers that don't actually draw their own content: those that draw into an ancestor,
and those that draw into a window.
Fixes assertions in existing tests.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateAfterLayout):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137840 => 137841)
--- trunk/Source/WebCore/ChangeLog 2012-12-16 18:10:56 UTC (rev 137840)
+++ trunk/Source/WebCore/ChangeLog 2012-12-16 18:14:52 UTC (rev 137841)
@@ -1,3 +1,20 @@
+2012-12-16 Simon Fraser <[email protected]>
+
+ Fix assertions when doing a full repaint of compositing layers
+ https://bugs.webkit.org/show_bug.cgi?id=105128
+
+ Reviewed by Dan Bernstein.
+
+ In r137811 I added code to repaint all compositing layers when FrameView::layout()
+ is doing a full repaint. However, this code needs to avoid calling setContentsNeedDisplay()
+ on layers that don't actually draw their own content: those that draw into an ancestor,
+ and those that draw into a window.
+
+ Fixes assertions in existing tests.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateAfterLayout):
+
2012-12-16 ChangSeok Oh <[email protected]>
[GTK][AC] Build failure with an option --with-acceleration-backend=clutter
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (137840 => 137841)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-12-16 18:10:56 UTC (rev 137840)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-12-16 18:14:52 UTC (rev 137841)
@@ -436,7 +436,7 @@
}
}
- if (flags & NeedsFullRepaint)
+ if (flags & NeedsFullRepaint && !paintsIntoWindow() && !paintsIntoCompositedAncestor())
setContentsNeedDisplay();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
