Title: [116831] trunk/Source/WebCore
- Revision
- 116831
- Author
- bda...@apple.com
- Date
- 2012-05-11 18:19:38 -0700 (Fri, 11 May 2012)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=86278
Composited layers should only run the overlay scrollbars painting pass
if necessary
Reviewed by Dan Bernstein.
It's not enough that the rootLayer has dirty scrollbars; we also have
to actually be doing the overlay scrollbars painting pass to skip the
early return.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::paintLayer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (116830 => 116831)
--- trunk/Source/WebCore/ChangeLog 2012-05-12 00:56:13 UTC (rev 116830)
+++ trunk/Source/WebCore/ChangeLog 2012-05-12 01:19:38 UTC (rev 116831)
@@ -1,3 +1,17 @@
+2012-05-11 Beth Dakin <bda...@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=86278
+ Composited layers should only run the overlay scrollbars painting pass
+ if necessary
+
+ Reviewed by Dan Bernstein.
+
+ It's not enough that the rootLayer has dirty scrollbars; we also have
+ to actually be doing the overlay scrollbars painting pass to skip the
+ early return.
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::paintLayer):
+
2012-05-11 Anders Carlsson <ander...@apple.com>
Comcast website displays bottom of page when loaded
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (116830 => 116831)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-05-12 00:56:13 UTC (rev 116830)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-05-12 01:19:38 UTC (rev 116831)
@@ -2886,7 +2886,7 @@
// but we need to ensure that we don't cache clip rects computed with the wrong root in this case.
if (context->updatingControlTints() || (paintBehavior & PaintBehaviorFlattenCompositingLayers))
paintFlags |= PaintLayerTemporaryClipRects;
- else if (!backing()->paintsIntoWindow() && !backing()->paintsIntoCompositedAncestor() && !shouldDoSoftwarePaint(this, paintFlags & PaintLayerPaintingReflection) && !rootLayer->containsDirtyOverlayScrollbars()) {
+ else if (!backing()->paintsIntoWindow() && !backing()->paintsIntoCompositedAncestor() && !shouldDoSoftwarePaint(this, paintFlags & PaintLayerPaintingReflection) && !(rootLayer->containsDirtyOverlayScrollbars() && (paintFlags & PaintLayerPaintingOverlayScrollbars))) {
// If this RenderLayer should paint into its backing, that will be done via RenderLayerBacking::paintIntoLayer().
return;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
