[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/testing/TestPaintArtifact.h"
 
 #include "cc/layers/layer.h"
 #include "platform/graphics/paint/DisplayItemClient.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/graphics/paint/ForeignLayerDisplayItem.h"
 #include "platform/graphics/paint/PaintArtifact.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/core/SkPicture.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
+#include "skia/ext/cdl_paint.h"
+#include "skia/ext/cdl_picture.h"
+#include "skia/ext/cdl_picture_recorder.h"
 #include "wtf/Assertions.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
 class TestPaintArtifact::DummyRectClient : public DisplayItemClient {
   USING_FAST_MALLOC(DummyRectClient);
 
  public:
   DummyRectClient(const FloatRect& rect, Color color)
       : m_rect(rect), m_color(color) {}
   String debugName() const final { return "<dummy>"; }
   LayoutRect visualRect() const final { return enclosingLayoutRect(m_rect); }
-  sk_sp<SkPicture> makePicture() const;
+  sk_sp<CdlPicture> makePicture() const;
 
  private:
   FloatRect m_rect;
   Color m_color;
 };
 
-sk_sp<SkPicture> TestPaintArtifact::DummyRectClient::makePicture() const {
-  SkPictureRecorder recorder;
-  SkCanvas* canvas = recorder.beginRecording(m_rect);
-  SkPaint paint;
+sk_sp<CdlPicture> TestPaintArtifact::DummyRectClient::makePicture() const {
+  CdlPictureRecorder recorder;
+  CdlCanvas* canvas = recorder.beginRecording(m_rect);
+  CdlPaint paint;
   paint.setColor(m_color.rgb());
   canvas->drawRect(m_rect, paint);
   return recorder.finishRecordingAsPicture();
 }
 
 TestPaintArtifact::TestPaintArtifact() : m_displayItemList(0), m_built(false) {}
 
 TestPaintArtifact::~TestPaintArtifact() {}
 
 TestPaintArtifact& TestPaintArtifact::chunk(
@@ skipping 50 matching lines @@
 
   if (!m_paintChunks.isEmpty())
     m_paintChunks.back().endIndex = m_displayItemList.size();
   m_paintArtifact = PaintArtifact(std::move(m_displayItemList),
                                   std::move(m_paintChunks), true);
   m_built = true;
   return m_paintArtifact;
 }
 
 }  // namespace blink