diff options
| author |  reed <reed@google.com> | 2016-02-15 08:27:14 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-15 08:27:14 -0800 |
| commit | 8681e60b2ccd4cea37128a129f1adf6a6d59bb7d (patch) | |
| tree | 1179977e2f2d896b9b09ce6a785bf409da986cc8 /gm/composeshader.cpp | |
| parent | a34be68a7eff0ae475b194f8a29975460cf3e456 (diff) | |
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
Diffstat (limited to 'gm/composeshader.cpp')
| -rw-r--r-- | gm/composeshader.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp index d482bc9420..2f3d99d364 100644 --- 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. |