Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(842)

Unified Diff: samplecode/SampleShaders.cpp

Issue 1697523003: make SkComposeShader.h private (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « samplecode/SampleArc.cpp ('k') | src/core/SkComposeShader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: samplecode/SampleShaders.cpp
diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp
index dd444ec34a80746d56d4b6eb666fe91f300d862c..2c0a6ab749c256e1e3b5bd2c279c8abb6908af10 100644
--- 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();
« no previous file with comments | « samplecode/SampleArc.cpp ('k') | src/core/SkComposeShader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698