Index: third_party/WebKit/Source/core/frame/FrameView.cpp |
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp |
index 4710794a11695ca31fa2a8fcadc5c27d30125f5b..0fb3e0710cd610d90412a0fd98adf550dbf0f95b 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp |
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp |
@@ -2403,7 +2403,7 @@ void FrameView::updateWidgetPositionsIfNeeded() |
updateWidgetPositions(); |
} |
-void FrameView::updateAllLifecyclePhases(const LayoutRect* interestRect) |
+void FrameView::updateAllLifecyclePhases(const IntRect* interestRect) |
{ |
frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(AllPhases, interestRect); |
} |
@@ -2419,7 +2419,7 @@ void FrameView::updateLifecycleToLayoutClean() |
frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(OnlyUpToLayoutClean, nullptr); |
} |
-void FrameView::updateLifecyclePhasesInternal(LifeCycleUpdateOption phases, const LayoutRect* interestRect) |
+void FrameView::updateLifecyclePhasesInternal(LifeCycleUpdateOption phases, const IntRect* interestRect) |
{ |
// This must be called from the root frame, since it recurses down, not up. |
// Otherwise the lifecycles of the frames might be out of sync. |
@@ -2485,7 +2485,7 @@ void FrameView::updatePaintProperties() |
forAllFrameViews([](FrameView& frameView) { frameView.lifecycle().advanceTo(DocumentLifecycle::UpdatePaintPropertiesClean); }); |
} |
-void FrameView::synchronizedPaint(const LayoutRect* interestRect) |
+void FrameView::synchronizedPaint(const IntRect* interestRect) |
{ |
ASSERT(RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled()); |
ASSERT(frame() == page()->mainFrame() || (!frame().tree().parent()->isLocalFrame())); |
@@ -2507,16 +2507,13 @@ void FrameView::synchronizedPaint(const LayoutRect* interestRect) |
}); |
} |
-void FrameView::synchronizedPaintRecursively(GraphicsLayer* graphicsLayer, const LayoutRect* interestRect) |
+void FrameView::synchronizedPaintRecursively(GraphicsLayer* graphicsLayer, const IntRect* interestRect) |
{ |
ASSERT(graphicsLayer->paintController()); |
GraphicsContext context(*graphicsLayer->paintController()); |
// TODO(chrishtr): fix unit tests to not inject one-off interest rects. |
- if (interestRect) |
- graphicsLayer->paint(context, roundedIntRect(*interestRect)); |
- else |
- graphicsLayer->paintIfNeeded(context); |
+ graphicsLayer->paint(context, interestRect); |
if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) |
graphicsLayer->paintController()->commitNewDisplayItems(); |