make SkComposeShader.h private

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1697523003

Review URL: https://codereview.chromium.org/1697523003

diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp
index d482bc9..2f3d99d 100644 (file)
--- a/gm/composeshader.cpp
+++ b/gm/composeshader.cpp
@@ -9,7 +9,6 @@
 
 #include "SkBitmapProcShader.h"
 #include "SkCanvas.h"
-#include "SkComposeShader.h"
 #include "SkGradientShader.h"
 #include "SkGraphics.h"
 #include "SkShader.h"
@@ -36,7 +35,7 @@ static SkShader* make_shader(SkXfermode::Mode mode) {
 
     SkAutoTUnref<SkXfermode> xfer(SkXfermode::Create(mode));
 
-    return new SkComposeShader(shaderA, shaderB, xfer);
+    return SkShader::CreateComposeShader(shaderA, shaderB, xfer);
 }
 
 class ComposeShaderGM : public skiagm::GM {
@@ -194,11 +193,11 @@ protected:
         SkAutoTUnref<SkXfermode> xfer(SkXfermode::Create(SkXfermode::kDstOver_Mode));
 
         // gradient should appear over color bitmap
-        SkAutoTUnref<SkShader> shader0(new SkComposeShader(fLinearGradientShader,
+        SkAutoTUnref<SkShader> shader0(SkShader::CreateComposeShader(fLinearGradientShader,
                                                            fColorBitmapShader,
                                                            xfer));
         // gradient should appear over alpha8 bitmap colorized by the paint color
-        SkAutoTUnref<SkShader> shader1(new SkComposeShader(fLinearGradientShader,
+        SkAutoTUnref<SkShader> shader1(SkShader::CreateComposeShader(fLinearGradientShader,
                                                            fAlpha8BitmapShader,
                                                            xfer));
 
@@ -226,7 +225,7 @@ protected:
     }
     
 private:
-    /** This determines the length and width of the bitmaps used in the SkComposeShaders.  Values
+    /** This determines the length and width of the bitmaps used in the ComposeShaders.  Values
      *  above 20 may cause an SkASSERT to fail in SkSmallAllocator. However, larger values will
      *  work in a release build.  You can change this parameter and then compile a release build
      *  to have this GM draw larger bitmaps for easier visual inspection.

diff --git a/gyp/core.gypi b/gyp/core.gypi
index 1700a05..fe743c9 100644 (file)
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -332,7 +332,6 @@
         '<(skia_include_path)/core/SkColor.h',
         '<(skia_include_path)/core/SkColorFilter.h',
         '<(skia_include_path)/core/SkColorPriv.h',
-        '<(skia_include_path)/core/SkComposeShader.h',
         '<(skia_include_path)/core/SkData.h',
         '<(skia_include_path)/core/SkDeque.h',
         '<(skia_include_path)/core/SkDevice.h',

diff --git a/samplecode/PerlinPatch.cpp b/samplecode/PerlinPatch.cpp
index 9bb95e5..de4d451 100644 (file)
--- a/samplecode/PerlinPatch.cpp
+++ b/samplecode/PerlinPatch.cpp
@@ -11,7 +11,6 @@
 #include "SkGradientShader.h"
 #include "SkPatchUtils.h"
 #include "SkPerlinNoiseShader2/SkPerlinNoiseShader2.h"
-#include "SkComposeShader.h"
 
 static void draw_control_points(SkCanvas* canvas, const SkPoint cubics[12]) {
     //draw control points
@@ -148,7 +147,7 @@ protected:
         SkScalar scaleFreq = 2.0;
         fShader1 = SkPerlinNoiseShader2::CreateImprovedNoise(fXFreq/scaleFreq, fYFreq/scaleFreq, 4,
                                                              fSeed);
-        fShaderCompose = new SkComposeShader(fShader0, fShader1);
+        fShaderCompose = SkShader::CreateComposeShader(fShader0, fShader1, nullptr);
 
         paint.setShader(fShaderCompose);
         canvas->drawPatch(fPts, nullptr, texCoords, xfer, paint);

diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
index ad3181f..addca35 100644 (file)
--- a/samplecode/SampleAll.cpp
+++ b/samplecode/SampleAll.cpp
@@ -28,7 +28,6 @@
 #include "SkPictureRecorder.h"
 #include "SkRegion.h"
 #include "SkShader.h"
-#include "SkComposeShader.h"
 #include "SkCornerPathEffect.h"
 #include "SkPathMeasure.h"
 #include "SkPicture.h"
@@ -511,7 +510,7 @@ protected:
         SkShader* shaderB = SkGradientShader::CreateLinear(pts, colors2, nullptr,
             2, SkShader::kClamp_TileMode);
         SkXfermode* mode = SkXfermode::Create(SkXfermode::kDstIn_Mode);
-        SkShader* result = new SkComposeShader(shaderA, shaderB, mode);
+        SkShader* result = SkShader::CreateComposeShader(shaderA, shaderB, mode);
         shaderA->unref();
         shaderB->unref();
         mode->unref();

diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp
index 834ba90..3b5288d 100644 (file)
--- a/samplecode/SampleArc.cpp
+++ b/samplecode/SampleArc.cpp
@@ -15,7 +15,6 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
-#include "SkComposeShader.h"
 #include "Sk1DPathEffect.h"
 #include "SkCornerPathEffect.h"
 #include "SkPathMeasure.h"

diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp
index dd444ec..2c0a6ab 100644 (file)
--- a/samplecode/SampleShaders.cpp
+++ b/samplecode/SampleShaders.cpp
@@ -16,7 +16,6 @@
 #include "SkShader.h"
 #include "SkUtils.h"
 #include "SkXfermode.h"
-#include "SkComposeShader.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"
@@ -38,7 +37,7 @@ static SkShader* make_bitmapfade(const SkBitmap& bm)
 
     SkXfermode* mode = SkXfermode::Create(SkXfermode::kDstIn_Mode);
 
-    SkShader* shader = new SkComposeShader(shaderB, shaderA, mode);
+    SkShader* shader = SkShader::CreateComposeShader(shaderB, shaderA, mode);
     shaderA->unref();
     shaderB->unref();
     mode->unref();
@@ -71,7 +70,7 @@ public:
 
         SkXfermode* mode = SkXfermode::Create(SkXfermode::kDstIn_Mode);
 
-        fShader = new SkComposeShader(shaderA, shaderB, mode);
+        fShader = SkShader::CreateComposeShader(shaderA, shaderB, mode);
         shaderA->unref();
         shaderB->unref();
         mode->unref();

diff --git a/src/core/SkComposeShader.cpp b/src/core/SkComposeShader.cpp
index c49d8a4..9e5e2c6 100644 (file)
--- a/src/core/SkComposeShader.cpp
+++ b/src/core/SkComposeShader.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkComposeShader.h"
 #include "SkColorFilter.h"
 #include "SkColorPriv.h"

diff --git a/include/core/SkComposeShader.h b/src/core/SkComposeShader.h
similarity index 100%
rename from include/core/SkComposeShader.h
rename to src/core/SkComposeShader.h