Title: [117149] branches/safari-536-branch/Source/WebCore
Diff
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (117148 => 117149)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-15 20:55:12 UTC (rev 117148)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-15 21:02:59 UTC (rev 117149)
@@ -1,5 +1,31 @@
2012-05-15 Lucas Forschler <[email protected]>
+ Merge 116799
+
+ 2012-05-11 Tim Horton <[email protected]>
+
+ FrameView->m_lastPaintTime is not updated in the tiled drawing case
+ https://bugs.webkit.org/show_bug.cgi?id=86246
+ <rdar://problem/11248475>
+
+ Reviewed by Simon Fraser.
+
+ Update FrameView's m_lastPaintTime from RenderLayerBacking::paintContents
+ if the RenderLayerBacking is backing a tiled drawing layer.
+
+ In the future we might want to consider updating m_lastPaintTime when any
+ compositing layer is painted into, but this change gets us on par with the
+ non-tiled-drawing case as it stands now.
+
+ No new tests.
+
+ * page/FrameView.h:
+ (WebCore::FrameView::setLastPaintTime):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::paintContents):
+
+2012-05-15 Lucas Forschler <[email protected]>
+
Merge 116832
2012-05-11 Jeffrey Pfau <[email protected]>
Modified: branches/safari-536-branch/Source/WebCore/page/FrameView.h (117148 => 117149)
--- branches/safari-536-branch/Source/WebCore/page/FrameView.h 2012-05-15 20:55:12 UTC (rev 117148)
+++ branches/safari-536-branch/Source/WebCore/page/FrameView.h 2012-05-15 21:02:59 UTC (rev 117149)
@@ -242,6 +242,7 @@
PaintBehavior paintBehavior() const;
bool isPainting() const;
bool hasEverPainted() const { return m_lastPaintTime; }
+ void setLastPaintTime(double lastPaintTime) { m_lastPaintTime = lastPaintTime; }
void setNodeToDraw(Node*);
virtual void paintOverhangAreas(GraphicsContext*, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect);
Modified: branches/safari-536-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (117148 => 117149)
--- branches/safari-536-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-05-15 20:55:12 UTC (rev 117148)
+++ branches/safari-536-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-05-15 21:02:59 UTC (rev 117149)
@@ -1206,6 +1206,9 @@
// We have to use the same root as for hit testing, because both methods can compute and cache clipRects.
paintIntoLayer(m_owningLayer, &context, dirtyRect, PaintBehaviorNormal, paintingPhase, renderer());
+ if (m_usingTiledCacheLayer)
+ m_owningLayer->renderer()->frame()->view()->setLastPaintTime(currentTime());
+
InspectorInstrumentation::didPaint(cookie);
} else if (graphicsLayer == layerForHorizontalScrollbar()) {
paintScrollbar(m_owningLayer->horizontalScrollbar(), context, clip);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
