Title: [117155] branches/safari-536-branch/Source/WebCore
Diff
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (117154 => 117155)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-15 21:12:04 UTC (rev 117154)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-15 21:14:58 UTC (rev 117155)
@@ -1,5 +1,23 @@
2012-05-15 Lucas Forschler <[email protected]>
+ Merge 116831
+
+ 2012-05-11 Beth Dakin <[email protected]>
+
+ 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-15 Lucas Forschler <[email protected]>
+
Merge 116830
2012-05-11 Anders Carlsson <[email protected]>
Modified: branches/safari-536-branch/Source/WebCore/rendering/RenderLayer.cpp (117154 => 117155)
--- branches/safari-536-branch/Source/WebCore/rendering/RenderLayer.cpp 2012-05-15 21:12:04 UTC (rev 117154)
+++ branches/safari-536-branch/Source/WebCore/rendering/RenderLayer.cpp 2012-05-15 21:14:58 UTC (rev 117155)
@@ -2891,7 +2891,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
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
