[NOT FOR COMMIT] Fully replace SkCanvas uses.

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 21 matching lines @@
 
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/skia/ImagePixelLocker.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "platform/image-encoders/PNGImageEncoder.h"
 #include "third_party/skia/include/core/SkImage.h"
 #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 "skia/ext/cdl_picture.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "wtf/HexNumber.h"
 #include "wtf/text/Base64.h"
 #include "wtf/text/TextEncoding.h"
 
 namespace blink {
 
 namespace {
 
@@ skipping 863 matching lines @@
   AutoLogger logger(this);
   logger.logItem("restore");
   this->SkCanvas::willRestore();
 }
 
 std::unique_ptr<JSONArray> LoggingCanvas::log() {
   return JSONArray::from(m_log->clone());
 }
 
 #ifndef NDEBUG
-String pictureAsDebugString(const SkPicture* picture) {
+String pictureAsDebugString(const CdlPicture* picture) {
   const SkIRect bounds = picture->cullRect().roundOut();
   LoggingCanvas canvas(bounds.width(), bounds.height());
   picture->playback(&canvas);
   std::unique_ptr<JSONObject> pictureAsJSON = JSONObject::create();
   pictureAsJSON->setObject("cullRect", objectForSkRect(picture->cullRect()));
   pictureAsJSON->setArray("operations", canvas.log());
   return pictureAsJSON->toPrettyJSONString();
 }
 
-void showSkPicture(const SkPicture* picture) {
+void showSkPicture(const CdlPicture* picture) {
   WTFLogAlways("%s\n", pictureAsDebugString(picture).utf8().data());
 }
 #endif
 
 }  // namespace blink