Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1475)

Unified Diff: Source/core/rendering/RenderLayerScrollableArea.cpp

Issue 160903002: Move RenderLayer repainting to repaint-after-layout framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Rebase to master Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderLayerRepainter.cpp ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayerScrollableArea.cpp
diff --git a/Source/core/rendering/RenderLayerScrollableArea.cpp b/Source/core/rendering/RenderLayerScrollableArea.cpp
index 73cdbd4d69612976284b185dced925a8b52349b0..f853c269513d06935c90b40684118bb58a9ec078 100644
--- a/Source/core/rendering/RenderLayerScrollableArea.cpp
+++ b/Source/core/rendering/RenderLayerScrollableArea.cpp
@@ -341,6 +341,8 @@ int RenderLayerScrollableArea::scrollSize(ScrollbarOrientation orientation) cons
void RenderLayerScrollableArea::setScrollOffset(const IntPoint& newScrollOffset)
{
+ LayoutRectRecorder recorder(*m_box);
+
if (!m_box->isMarquee()) {
// Ensure that the dimensions will be computed if they need to be (for overflow:hidden blocks).
if (m_scrollDimensionsDirty)
@@ -377,7 +379,12 @@ void RenderLayerScrollableArea::setScrollOffset(const IntPoint& newScrollOffset)
// The caret rect needs to be invalidated after scrolling
frame->selection().setCaretRectNeedsUpdate();
- FloatQuad quadForFakeMouseMoveEvent = FloatQuad(layer()->repainter().repaintRect());
+ FloatQuad quadForFakeMouseMoveEvent;
+ if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled())
+ quadForFakeMouseMoveEvent = FloatQuad(layer()->renderer()->newRepaintRect());
+ else
+ quadForFakeMouseMoveEvent = FloatQuad(layer()->repainter().repaintRect());
+
if (repaintContainer)
quadForFakeMouseMoveEvent = repaintContainer->localToAbsoluteQuad(quadForFakeMouseMoveEvent);
frame->eventHandler().dispatchFakeMouseMoveEventSoonInQuad(quadForFakeMouseMoveEvent);
@@ -397,10 +404,14 @@ void RenderLayerScrollableArea::setScrollOffset(const IntPoint& newScrollOffset)
// Just schedule a full repaint of our object.
if (requiresRepaint) {
- if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled() && m_box->frameView()->isInPerformLayout())
- m_box->setShouldDoFullRepaintAfterLayout(true);
- else
+ if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) {
+ if (m_box->frameView()->isInPerformLayout())
+ m_box->setShouldDoFullRepaintAfterLayout(true);
+ else
+ m_box->repaintUsingContainer(repaintContainer, pixelSnappedIntRect(layer()->renderer()->newRepaintRect()));
+ } else {
m_box->repaintUsingContainer(repaintContainer, pixelSnappedIntRect(layer()->repainter().repaintRect()));
+ }
}
// Schedule the scroll DOM event.
« no previous file with comments | « Source/core/rendering/RenderLayerRepainter.cpp ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698