Rename paint data structures

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 18 matching lines @@
 #include "platform/Length.h"
 #include "platform/PlatformInstrumentation.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/SharedBuffer.h"
 #include "platform/geometry/FloatPoint.h"
 #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/graphics/paint/PaintRecorder.h"
+#include "platform/graphics/paint/PaintShader.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "platform/network/mime/MIMETypeRegistry.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 "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,
-                                    SkShader::TileMode tmx,
-                                    SkShader::TileMode tmy) {
+sk_sp<PaintShader> createPatternShader(const SkImage* image,
+                                       const SkMatrix& shaderMatrix,
+                                       const SkPaint& paint,
+                                       const FloatSize& spacing,
+                                       SkShader::TileMode tmx,
+                                       SkShader::TileMode tmy) {
   if (spacing.isZero())
-    return image->makeShader(tmx, tmy, &shaderMatrix);
+    return MakePaintShaderImage(image, tmx, tmy, &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);
+  PaintRecorder recorder;
+  PaintCanvas* canvas = recorder.beginRecording(tileRect);
   canvas->drawImage(image, 0, 0, &paint);
 
-  return SkShader::MakePictureShader(recorder.finishRecordingAsPicture(), tmx,
-                                     tmy, &shaderMatrix, nullptr);
+  return MakePaintShaderRecord(recorder.finishRecordingAsPicture(), tmx, tmy,
+                               &shaderMatrix, nullptr);
 }
 
 SkShader::TileMode computeTileMode(float left,
                                    float right,
                                    float min,
                                    float max) {
   DCHECK(left < right);
   return left >= min && right <= max ? SkShader::kClamp_TileMode
                                      : SkShader::kRepeat_TileMode;
 }
@@ skipping 42 matching lines @@
 
   const FloatSize tileSize(
       image->width() * scale.width() + repeatSpacing.width(),
       image->height() * scale.height() + repeatSpacing.height());
   const auto tmx = computeTileMode(destRect.x(), destRect.maxX(), adjustedX,
                                    adjustedX + tileSize.width());
   const auto tmy = computeTileMode(destRect.y(), destRect.maxY(), adjustedY,
                                    adjustedY + tileSize.height());
 
   {
-    SkPaint paint = context.fillPaint();
+    PaintFlags 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()),
                             tmx, tmy));
@@ skipping 56 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