[NOT FOR COMMIT] Fully replace SkCanvas uses.

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

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 24 matching lines @@
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/FloatSize.h"
 #include "platform/graphics/BitmapImage.h"
 #include "platform/graphics/DeferredImageDecoder.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/tracing/TraceEvent.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebData.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 "skia/ext/cdl_shader.h"
 #include "wtf/StdLibExtras.h"
 
 #include <math.h>
 #include <tuple>
 
 namespace blink {
 
 Image::Image(ImageObserver* observer)
     : m_imageObserver(observer), m_imageObserverDisabled(false) {}
 
@@ skipping 159 matching lines @@
   } else {
     drawPattern(ctxt, srcRect, tileScaleFactor, patternPhase, op, dstRect,
                 spacing);
   }
 
   startAnimation();
 }
 
 namespace {
 
-sk_sp<SkShader> createPatternShader(const SkImage* image,
-                                    const SkMatrix& shaderMatrix,
-                                    const SkPaint& paint,
-                                    const FloatSize& spacing) {
+sk_sp<CdlShader> createPatternShader(const SkImage* image,
+                                     const SkMatrix& shaderMatrix,
+                                     const CdlPaint& paint,
+                                     const FloatSize& spacing) {
   if (spacing.isZero())
-    return image->makeShader(SkShader::kRepeat_TileMode,
-                             SkShader::kRepeat_TileMode, &shaderMatrix);
+    return MakeCdlImageShader(sk_ref_sp(const_cast<SkImage*>(image)),
+                              SkShader::kRepeat_TileMode,
+                              SkShader::kRepeat_TileMode, &shaderMatrix);
 
   // Arbitrary tiling is currently only supported for SkPictureShader, so we use
   // that instead of a plain bitmap shader to implement spacing.
   const SkRect tileRect = SkRect::MakeWH(image->width() + spacing.width(),
                                          image->height() + spacing.height());
 
-  SkPictureRecorder recorder;
-  SkCanvas* canvas = recorder.beginRecording(tileRect);
+  CdlPictureRecorder recorder;
+  CdlCanvas* canvas = recorder.beginRecording(tileRect);
   canvas->drawImage(image, 0, 0, &paint);
 
-  return SkShader::MakePictureShader(
+  return CdlShader::MakePictureShader(
       recorder.finishRecordingAsPicture(), SkShader::kRepeat_TileMode,
       SkShader::kRepeat_TileMode, &shaderMatrix, nullptr);
 }
 
 }  // anonymous namespace
 
 void Image::drawPattern(GraphicsContext& context,
                         const FloatRect& floatSrcRect,
                         const FloatSize& scale,
                         const FloatPoint& phase,
@@ skipping 27 matching lines @@
   localMatrix.preScale(scale.width(), scale.height());
 
   // Fetch this now as subsetting may swap the image.
   auto imageID = image->uniqueID();
 
   image = image->makeSubset(enclosingIntRect(normSrcRect));
   if (!image)
     return;
 
   {
-    SkPaint paint = context.fillPaint();
+    CdlPaint paint = context.fillPaint();
     paint.setColor(SK_ColorBLACK);
     paint.setBlendMode(compositeOp);
     paint.setFilterQuality(
         context.computeFilterQuality(this, destRect, normSrcRect));
     paint.setAntiAlias(context.shouldAntialias());
     paint.setShader(createPatternShader(
         image.get(), localMatrix, paint,
         FloatSize(repeatSpacing.width() / scale.width(),
                   repeatSpacing.height() / scale.height())));
     context.drawRect(destRect, paint);
   }
 
   if (currentFrameIsLazyDecoded())
     PlatformInstrumentation::didDrawLazyPixelRef(imageID);
 }
 
 PassRefPtr<Image> Image::imageForDefaultFrame() {
   RefPtr<Image> image(this);
 
   return image.release();
 }
 
 bool Image::isTextureBacked() {
   sk_sp<SkImage> image = imageForCurrentFrame();
   return image ? image->isTextureBacked() : false;
 }
 
-bool Image::applyShader(SkPaint& paint, const SkMatrix& localMatrix) {
+bool Image::applyShader(CdlPaint& paint, const SkMatrix& localMatrix) {
   // Default shader impl: attempt to build a shader based on the current frame
   // SkImage.
   sk_sp<SkImage> image = imageForCurrentFrame();
   if (!image)
     return false;
 
-  paint.setShader(image->makeShader(SkShader::kRepeat_TileMode,
-                                    SkShader::kRepeat_TileMode, &localMatrix));
+  paint.setShader(MakeCdlImageShader(image, SkShader::kRepeat_TileMode,
+                                     SkShader::kRepeat_TileMode, &localMatrix));
 
   // Animation is normally refreshed in draw() impls, which we don't call when
   // painting via shaders.
   startAnimation();
 
   return true;
 }
 
 FloatRect Image::computeTileContaining(const FloatPoint& point,
                                        const FloatSize& tileSize,
@@ skipping 22 matching lines @@
   FloatRect subset = dest;
   subset.setX((dest.x() - tile.x()) / scale.width());
   subset.setY((dest.y() - tile.y()) / scale.height());
   subset.setWidth(dest.width() / scale.width());
   subset.setHeight(dest.height() / scale.height());
 
   return subset;
 }
 
 }  // namespace blink