[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/layers/picture_image_layer.cc

 // Copyright 2010 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/layers/picture_image_layer.h"
 
 #include <stddef.h>
 
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/playback/drawing_display_item.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
+#include "skia/ext/cdl_picture_recorder.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
 scoped_refptr<PictureImageLayer> PictureImageLayer::Create() {
   return make_scoped_refptr(new PictureImageLayer());
 }
 
 PictureImageLayer::PictureImageLayer() : PictureLayer(this) {}
 
@@ skipping 35 matching lines @@
   DCHECK_GT(image_->width(), 0);
   DCHECK_GT(image_->height(), 0);
   DCHECK(layer_tree_host());
 
   DisplayItemListSettings settings;
   settings.use_cached_picture =
       layer_tree_host()->GetSettings().use_cached_picture_raster;
   scoped_refptr<DisplayItemList> display_list =
       DisplayItemList::Create(settings);
 
-  SkPictureRecorder recorder;
-  SkCanvas* canvas =
+  CdlPictureRecorder recorder;
+  CdlCanvas* canvas =
       recorder.beginRecording(gfx::RectToSkRect(PaintableRegion()));
 
   SkScalar content_to_layer_scale_x =
       SkFloatToScalar(static_cast<float>(bounds().width()) / image_->width());
   SkScalar content_to_layer_scale_y =
       SkFloatToScalar(static_cast<float>(bounds().height()) / image_->height());
   canvas->scale(content_to_layer_scale_x, content_to_layer_scale_y);
 
   // Because Android WebView resourceless software draw mode rasters directly
   // to the root canvas, this draw must use the kSrcOver_Mode so that
   // transparent images blend correctly.
   canvas->drawImage(image_.get(), 0, 0);
 
   display_list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       PaintableRegion(), recorder.finishRecordingAsPicture());
 
   display_list->Finalize();
   return display_list;
 }
 
 bool PictureImageLayer::FillsBoundsCompletely() const {
   return false;
 }
 
 size_t PictureImageLayer::GetApproximateUnsharedMemoryUsage() const {
   return 0;
 }
 
 }  // namespace cc