[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/playback/clip_path_display_item.cc

 // Copyright 2015 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 "cc/playback/clip_path_display_item.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/proto/display_item.pb.h"
 #include "cc/proto/skia_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "skia/ext/cdl_canvas.h"
 
 namespace cc {
 
 ClipPathDisplayItem::ClipPathDisplayItem(const SkPath& clip_path,
                                          SkRegion::Op clip_op,
                                          bool antialias) {
   SetNew(clip_path, clip_op, antialias);
 }
 
 ClipPathDisplayItem::ClipPathDisplayItem(const proto::DisplayItem& proto) {
@@ skipping 33 matching lines @@
 
   // Just use skia's serialization method for the SkPath for now.
   size_t path_size = clip_path_.writeToMemory(nullptr);
   if (path_size > 0) {
     std::unique_ptr<uint8_t[]> buffer(new uint8_t[path_size]);
     clip_path_.writeToMemory(buffer.get());
     details->set_clip_path(buffer.get(), path_size);
   }
 }
 
-void ClipPathDisplayItem::Raster(SkCanvas* canvas,
+void ClipPathDisplayItem::Raster(CdlCanvas* canvas,
                                  SkPicture::AbortCallback* callback) const {
   canvas->save();
   canvas->clipPath(clip_path_, clip_op_, antialias_);
 }
 
 void ClipPathDisplayItem::AsValueInto(
     const gfx::Rect& visual_rect,
     base::trace_event::TracedValue* array) const {
   array->AppendString(base::StringPrintf(
       "ClipPathDisplayItem length: %d visualRect: [%s]",
@@ skipping 13 matching lines @@
   DCHECK_EQ(proto::DisplayItem::Type_EndClipPath, proto.type());
 }
 
 EndClipPathDisplayItem::~EndClipPathDisplayItem() {
 }
 
 void EndClipPathDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   proto->set_type(proto::DisplayItem::Type_EndClipPath);
 }
 
-void EndClipPathDisplayItem::Raster(
-    SkCanvas* canvas,
-    SkPicture::AbortCallback* callback) const {
+void EndClipPathDisplayItem::Raster(CdlCanvas* canvas,
+                                    SkPicture::AbortCallback* callback) const {
   canvas->restore();
 }
 
 void EndClipPathDisplayItem::AsValueInto(
     const gfx::Rect& visual_rect,
     base::trace_event::TracedValue* array) const {
   array->AppendString(
       base::StringPrintf("EndClipPathDisplayItem visualRect: [%s]",
                          visual_rect.ToString().c_str()));
 }
 
 size_t EndClipPathDisplayItem::ExternalMemoryUsage() const {
   return 0;
 }
 
 }  // namespace cc