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

Unified Diff: Source/core/paint/LayoutObjectDrawingRecorder.h

Issue 1312423006: Remove dependency on m_previousPositionFromPaintInvalidationBacking for spv2 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update TestExpectations Created 5 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
« no previous file with comments | « Source/core/paint/DeprecatedPaintLayer.cpp ('k') | Source/platform/graphics/paint/DisplayItemList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/LayoutObjectDrawingRecorder.h
diff --git a/Source/core/paint/LayoutObjectDrawingRecorder.h b/Source/core/paint/LayoutObjectDrawingRecorder.h
index 0328359a285a60a194dad495ddea773f5c280f3d..81fba8cc836e2882f4a809e9b7af59a975ff9123 100644
--- a/Source/core/paint/LayoutObjectDrawingRecorder.h
+++ b/Source/core/paint/LayoutObjectDrawingRecorder.h
@@ -53,7 +53,7 @@ public:
LayoutObjectDrawingRecorder(GraphicsContext& context, const LayoutObject& layoutObject, DisplayItem::Type displayItemType, const FloatRect& clip, const LayoutPoint& paintOffset)
{
- updatePaintOffsetIfNeeded(context.displayItemList(), layoutObject.displayItemClient(), paintOffset);
+ updatePaintOffsetIfNeeded(context.displayItemList(), layoutObject, paintOffset);
// We may paint a delayed-invalidation object before it's actually invalidated.
if (layoutObject.fullPaintInvalidationReason() == PaintInvalidationDelayedFull)
m_cacheSkipper.emplace(context);
@@ -74,7 +74,7 @@ public:
LayoutObjectDrawingRecorder(GraphicsContext& context, const InlineBox& inlineBox, DisplayItem::Type displayItemType, const FloatRect& clip, const LayoutPoint& paintOffset)
{
- updatePaintOffsetIfNeeded(context.displayItemList(), inlineBox.displayItemClient(), paintOffset);
+ updatePaintOffsetIfNeeded(context.displayItemList(), inlineBox, paintOffset);
m_drawingRecorder.emplace(context, inlineBox, displayItemType, clip);
}
@@ -92,17 +92,17 @@ public:
#endif
private:
- static void updatePaintOffsetIfNeeded(DisplayItemList* displayItemList, DisplayItemClient displayItemClient, const LayoutPoint& paintOffset)
+ static void updatePaintOffsetIfNeeded(DisplayItemList* displayItemList, const DisplayItemClientWrapper& client, const LayoutPoint& paintOffset)
{
if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled())
return;
// TODO(pdr): The paint offset cache should be stored on LayoutObject but is temporarily on the DisplayItemList.
- if (!displayItemList->paintOffsetIsUnchanged(displayItemClient, paintOffset)) {
- displayItemList->recordPaintOffset(displayItemClient, paintOffset);
- displayItemList->invalidatePaintOffset(displayItemClient);
+ if (!displayItemList->paintOffsetIsUnchanged(client.displayItemClient(), paintOffset)) {
+ displayItemList->recordPaintOffset(client.displayItemClient(), paintOffset);
+ displayItemList->invalidatePaintOffset(client);
} else {
- ASSERT(!displayItemList->paintOffsetWasInvalidated(displayItemClient) || !displayItemList->clientCacheIsValid(displayItemClient));
+ ASSERT(!displayItemList->paintOffsetWasInvalidated(client.displayItemClient()) || !displayItemList->clientCacheIsValid(client.displayItemClient()));
}
}
« no previous file with comments | « Source/core/paint/DeprecatedPaintLayer.cpp ('k') | Source/platform/graphics/paint/DisplayItemList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698