Rename paint data structures

third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp

Index: third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp b/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp
index 8de896ce6e92e13e6ad02758a6ef3886c4e5a1a6..b17970e0daf4a7b8959b0f4048b6f87fdee195ef 100644
--- a/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp
+++ b/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp
@@ -32,6 +32,7 @@
 
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/ImageBuffer.h"
+#include "platform/graphics/paint/PaintRecord.h"
 #include "platform/graphics/skia/ImagePixelLocker.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "platform/image-encoders/PNGImageEncoder.h"
@@ -39,7 +40,6 @@
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
-#include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "wtf/HexNumber.h"
@@ -915,7 +915,7 @@ std::unique_ptr<JSONArray> LoggingCanvas::log() {
 }
 
 #ifndef NDEBUG
-String pictureAsDebugString(const SkPicture* picture) {
+String pictureAsDebugString(const PaintRecord* picture) {
   const SkIRect bounds = picture->cullRect().roundOut();
   LoggingCanvas canvas(bounds.width(), bounds.height());

[danakj, 2017/01/25 17:33:28]

This needs to be wrapped in a PaintCanvas. Or LoggingCanvas needs to not be an
SkCanvas

[enne (OOO), 2017/01/25 21:07:16]

Oops, missed this one.  LoggingCanvas and ReplayingCanvas are going to stay
SkCanvas things for the inspector, and will just be wrapped in a passthrough
canvas.

   picture->playback(&canvas);
@@ -925,7 +925,7 @@ String pictureAsDebugString(const SkPicture* picture) {
   return pictureAsJSON->toPrettyJSONString();
 }
 
-void showSkPicture(const SkPicture* picture) {
+void showSkPicture(const PaintRecord* picture) {
   WTFLogAlways("%s\n", pictureAsDebugString(picture).utf8().data());
 }
 #endif