[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/playback/discardable_image_map.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/discardable_image_map.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <limits>
 
 #include "base/containers/adapters.h"
 #include "base/memory/ptr_util.h"
 #include "cc/base/math_util.h"
 #include "cc/playback/display_item_list.h"
-#include "third_party/skia/include/utils/SkNWayCanvas.h"
+#include "skia/ext/cdl_no_draw_canvas.h"
+#include "skia/ext/cdl_paint.h"
+#include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
 SkRect MapRect(const SkMatrix& matrix, const SkRect& src) {
   SkRect dst;
   matrix.mapRect(&dst, src);
   return dst;
 }
@@ skipping 22 matching lines @@
                                  max_size.width() - bounds_rect.x()));
   bounds_rect.set_height(std::min(bounds_rect.height() + y_offset_if_negative,
                                   max_size.height() - bounds_rect.y()));
   return gfx::ToEnclosingRect(bounds_rect);
 }
 
 namespace {
 
 // We're using an NWay canvas with no added canvases, so in effect
 // non-overridden functions are no-ops.
-class DiscardableImagesMetadataCanvas : public SkNWayCanvas {
+class DiscardableImagesMetadataCanvas : public CdlNoDrawCanvas {
  public:
   DiscardableImagesMetadataCanvas(
       int width,
       int height,
       std::vector<std::pair<DrawImage, gfx::Rect>>* image_set)
-      : SkNWayCanvas(width, height),
+      : CdlNoDrawCanvas(width, height),
         image_set_(image_set),
         canvas_bounds_(SkRect::MakeIWH(width, height)),
         canvas_size_(width, height) {}
 
  protected:
-  // we need to "undo" the behavior of SkNWayCanvas, which will try to forward
-  // it.
-  void onDrawPicture(const SkPicture* picture,
+  // we need to "undo" the behavior of CdlNoDrawCanvas, which will ignore
+  // onDrawPicture().
+  void onDrawPicture(const CdlPicture* picture,
                      const SkMatrix* matrix,
-                     const SkPaint* paint) override {
-    SkCanvas::onDrawPicture(picture, matrix, paint);
+                     const CdlPaint* paint) override {
+    CdlCanvas::onDrawPicture(picture, matrix, paint);
   }
 
   void onDrawImage(const SkImage* image,
                    SkScalar x,
                    SkScalar y,
-                   const SkPaint* paint) override {
+                   const CdlPaint* paint) override {
     const SkMatrix& ctm = getTotalMatrix();
     AddImage(
         sk_ref_sp(image), SkRect::MakeIWH(image->width(), image->height()),
         MapRect(ctm, SkRect::MakeXYWH(x, y, image->width(), image->height())),
         ctm, paint);
   }
 
   void onDrawImageRect(const SkImage* image,
                        const SkRect* src,
                        const SkRect& dst,
-                       const SkPaint* paint,
-                       SrcRectConstraint) override {
+                       const CdlPaint* paint,
+                       SkCanvas::SrcRectConstraint) override {
     const SkMatrix& ctm = getTotalMatrix();
     SkRect src_storage;
     if (!src) {
       src_storage = SkRect::MakeIWH(image->width(), image->height());
       src = &src_storage;
     }
     SkMatrix matrix;
     matrix.setRectToRect(*src, dst, SkMatrix::kFill_ScaleToFit);
     matrix.postConcat(ctm);
     AddImage(sk_ref_sp(image), *src, MapRect(ctm, dst), matrix, paint);
   }
 
-  void onDrawImageNine(const SkImage* image,
-                       const SkIRect& center,
-                       const SkRect& dst,
-                       const SkPaint* paint) override {
-    // No cc embedder issues image nine calls.
-    NOTREACHED();
+#if CDL_ENABLED
+  int onSaveLayer(const SaveLayerRec& rec) override {
+    saved_paints_.push_back(*rec.fPaint);
+    return CdlNoDrawCanvas::onSaveLayer(rec);
   }
 
+  int onSave() override {
+    saved_paints_.push_back(CdlPaint());
+    return CdlNoDrawCanvas::onSave();
+  }
+
+  void onRestore() override {
+    DCHECK_GT(saved_paints_.size(), 0u);
+    saved_paints_.pop_back();
+    CdlNoDrawCanvas::onRestore();
+  }
+#else
   SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec& rec) override {
     saved_paints_.push_back(*rec.fPaint);
-    return SkNWayCanvas::getSaveLayerStrategy(rec);
+    return CdlNoDrawCanvas::getSaveLayerStrategy(rec);
   }
 
   void willSave() override {
     saved_paints_.push_back(SkPaint());
-    return SkNWayCanvas::willSave();
+    return CdlNoDrawCanvas::willSave();
   }
 
   void willRestore() override {
     DCHECK_GT(saved_paints_.size(), 0u);
     saved_paints_.pop_back();
-    SkNWayCanvas::willRestore();
+    CdlNoDrawCanvas::willRestore();
   }
+#endif
 
  private:
   bool ComputePaintBounds(const SkRect& rect,
-                          const SkPaint* current_paint,
+                          const CdlPaint* current_paint,
                           SkRect* paint_bounds) {
     *paint_bounds = rect;
     if (current_paint) {
       if (!current_paint->canComputeFastBounds())
         return false;
       *paint_bounds =
           current_paint->computeFastBounds(*paint_bounds, paint_bounds);
     }
 
     for (const auto& paint : base::Reversed(saved_paints_)) {
       if (!paint.canComputeFastBounds())
         return false;
       *paint_bounds = paint.computeFastBounds(*paint_bounds, paint_bounds);
     }
     return true;
   }
 
   void AddImage(sk_sp<const SkImage> image,
                 const SkRect& src_rect,
                 const SkRect& rect,
                 const SkMatrix& matrix,
-                const SkPaint* paint) {
+                const CdlPaint* paint) {
     if (!image->isLazyGenerated())
       return;
 
     SkRect paint_rect;
     bool computed_paint_bounds = ComputePaintBounds(rect, paint, &paint_rect);
     if (!computed_paint_bounds) {
       // TODO(vmpstr): UMA this case.
       paint_rect = canvas_bounds_;
     }
 
     if (!paint_rect.intersects(canvas_bounds_))
       return;
 
     SkFilterQuality filter_quality = kNone_SkFilterQuality;
     if (paint) {
       filter_quality = paint->getFilterQuality();
     }
 
     SkIRect src_irect;
     src_rect.roundOut(&src_irect);
     image_set_->push_back(std::make_pair(
         DrawImage(std::move(image), src_irect, filter_quality, matrix),
         SafeClampPaintRectToSize(paint_rect, canvas_size_)));
   }
 
   std::vector<std::pair<DrawImage, gfx::Rect>>* image_set_;
   const SkRect canvas_bounds_;
   const gfx::Size canvas_size_;
-  std::vector<SkPaint> saved_paints_;
+  std::vector<CdlPaint> saved_paints_;
 };
 
 }  // namespace
 
 DiscardableImageMap::DiscardableImageMap() {}
 
 DiscardableImageMap::~DiscardableImageMap() {}
 
-std::unique_ptr<SkCanvas> DiscardableImageMap::BeginGeneratingMetadata(
+std::unique_ptr<CdlCanvas> DiscardableImageMap::BeginGeneratingMetadata(
     const gfx::Size& bounds) {
   DCHECK(all_images_.empty());
+  // TODO(cdl): switch to using std::unique_ptrs?
   return base::MakeUnique<DiscardableImagesMetadataCanvas>(
       bounds.width(), bounds.height(), &all_images_);
 }
 
 void DiscardableImageMap::EndGeneratingMetadata() {
   images_rtree_.Build(all_images_,
                       [](const std::pair<DrawImage, gfx::Rect>& image) {
                         return image.second;
                       });
 }
@@ skipping 12 matching lines @@
     DiscardableImageMap* image_map,
     const gfx::Size& bounds)
     : image_map_(image_map),
       metadata_canvas_(image_map->BeginGeneratingMetadata(bounds)) {}
 
 DiscardableImageMap::ScopedMetadataGenerator::~ScopedMetadataGenerator() {
   image_map_->EndGeneratingMetadata();
 }
 
 }  // namespace cc