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

Unified Diff: third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp

Issue 2293293003: Make CaretBase a DisplayItemClient. (Closed)
Patch Set: Fix unit test and disable failing test on SPv2. Created 4 years, 3 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
Index: third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp
diff --git a/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp b/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp
index eaa3c64c51778447503ef7f6afef0a014e861eb0..81a301b5097852b9f51aed67aee644a216f7b286 100644
--- a/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp
+++ b/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp
@@ -274,15 +274,15 @@ void ObjectPaintInvalidator::invalidatePaintUsingContainer(const LayoutBoxModelO
setBackingNeedsPaintInvalidationInRect(paintInvalidationContainer, dirtyRect, invalidationReason);
}
-void ObjectPaintInvalidator::invalidatePaintRectangle(const LayoutRect& dirtyRect, DisplayItemClient* displayItemClient)
+LayoutRect ObjectPaintInvalidator::invalidatePaintRectangle(const LayoutRect& dirtyRect, DisplayItemClient* displayItemClient)
{
CHECK(m_object.isRooted());
if (dirtyRect.isEmpty())
- return;
+ return LayoutRect();
if (m_object.view()->document().printing())
- return; // Don't invalidate paints if we're printing.
+ return LayoutRect(); // Don't invalidate paints if we're printing.
const LayoutBoxModelObject& paintInvalidationContainer = m_object.containerForPaintInvalidation();
LayoutRect dirtyRectOnBacking = dirtyRect;
@@ -295,6 +295,8 @@ void ObjectPaintInvalidator::invalidatePaintRectangle(const LayoutRect& dirtyRec
invalidateDisplayItemClient(*displayItemClient, PaintInvalidationRectangle);
else
m_object.invalidateDisplayItemClients(PaintInvalidationRectangle);
+
+ return dirtyRectOnBacking;
}
void ObjectPaintInvalidator::slowSetPaintingLayerNeedsRepaint()

Powered by Google App Engine
This is Rietveld 408576698