Always use own PaintController in GraphicsLayer::paint()

third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp

Index: third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp
index 9f9497db1ec6dcae528b98a719ce922c7277a547..1333734d22e4e13494a9e72401bed13d5d2812ce 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp
@@ -326,11 +326,14 @@ void InspectorLayerTreeAgent::makeSnapshot(ErrorString* errorString, const Strin
 
     IntSize size = expandedIntSize(layer->size());
 
-    SkPictureBuilder pictureBuilder(FloatRect(0, 0, size.width(), size.height()));
+    GraphicsContext context(*layer->paintController());
     IntRect interestRect(IntPoint(0, 0), size);
-    layer->paint(pictureBuilder.context(), &interestRect);
+    layer->paint(context, &interestRect);
+    layer->paintController()->commitNewDisplayItems();
 
-    RefPtr<PictureSnapshot> snapshot = adoptRef(new PictureSnapshot(pictureBuilder.endRecording()));
+    context.beginRecording(interestRect);
+    layer->paintController()->paintArtifact().replay(context);
+    RefPtr<PictureSnapshot> snapshot = adoptRef(new PictureSnapshot(context.endRecording()));
 
     *snapshotId = String::number(++s_lastSnapshotId);
     bool newEntry = m_snapshotById.add(*snapshotId, snapshot).isNewEntry;