Index: third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp |
diff --git a/third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp b/third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp |
index 0228a6645f170dcd3eec94799132b7014f51266e..f74205e60bc55910d4ab87c51c74a629a378b342 100644 |
--- a/third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp |
@@ -14,11 +14,11 @@ |
namespace blink { |
-bool DrawingRecorder::useCachedDrawingIfPossible(GraphicsContext& context, const DisplayItemClientWrapper& client, DisplayItem::Type type) |
+bool DrawingRecorder::useCachedDrawingIfPossible(GraphicsContext& context, const DisplayItemClient& client, DisplayItem::Type type) |
{ |
ASSERT(DisplayItem::isDrawingType(type)); |
- if (!context.paintController().clientCacheIsValid(client.displayItemClient())) |
+ if (!context.paintController().clientCacheIsValid(client)) |
return false; |
context.paintController().createAndAppend<CachedDisplayItem>(client, DisplayItem::drawingTypeToCachedDrawingType(type)); |
@@ -33,7 +33,7 @@ bool DrawingRecorder::useCachedDrawingIfPossible(GraphicsContext& context, const |
return true; |
} |
-DrawingRecorder::DrawingRecorder(GraphicsContext& context, const DisplayItemClientWrapper& displayItemClient, DisplayItem::Type displayItemType, const FloatRect& cullRect) |
+DrawingRecorder::DrawingRecorder(GraphicsContext& context, const DisplayItemClient& displayItemClient, DisplayItem::Type displayItemType, const FloatRect& cullRect) |
: m_context(context) |
, m_displayItemClient(displayItemClient) |
, m_displayItemType(displayItemType) |
@@ -46,7 +46,7 @@ DrawingRecorder::DrawingRecorder(GraphicsContext& context, const DisplayItemClie |
return; |
// Must check DrawingRecorder::useCachedDrawingIfPossible before creating the DrawingRecorder. |
- ASSERT((RuntimeEnabledFeatures::slimmingPaintOffsetCachingEnabled() && context.paintController().paintOffsetWasInvalidated(displayItemClient.displayItemClient())) |
+ ASSERT((RuntimeEnabledFeatures::slimmingPaintOffsetCachingEnabled() && context.paintController().paintOffsetWasInvalidated(displayItemClient)) |
|| RuntimeEnabledFeatures::slimmingPaintUnderInvalidationCheckingEnabled() |
|| !useCachedDrawingIfPossible(m_context, m_displayItemClient, m_displayItemType)); |