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

Unified Diff: src/core/SkShader.cpp

Issue 1228683002: rename GrShaderDataManager -> GrProcessorDataManager (Closed) Base URL: https://skia.googlesource.com/skia.git@grfixuptests
Patch Set: rebase onto origin/master Created 5 years, 5 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 | « src/core/SkPictureShader.cpp ('k') | src/core/SkXfermode.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkShader.cpp
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp
index d1f66117273c8155edc483a93bb9465f00816deb..e5c879eecb39352a33f8ffd22532c800877f4590 100644
--- a/src/core/SkShader.cpp
+++ b/src/core/SkShader.cpp
@@ -215,7 +215,8 @@ SkShader::GradientType SkShader::asAGradient(GradientInfo* info) const {
}
bool SkShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, const SkMatrix*,
- GrColor*, GrShaderDataManager*, GrFragmentProcessor**) const {
+ GrColor*, GrProcessorDataManager*,
+ GrFragmentProcessor**) const {
return false;
}
@@ -346,8 +347,8 @@ SkShader::GradientType SkColorShader::asAGradient(GradientInfo* info) const {
#include "SkGr.h"
bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMatrix&,
- const SkMatrix*, GrColor* paintColor, GrShaderDataManager*,
- GrFragmentProcessor** fp) const {
+ const SkMatrix*, GrColor* paintColor,
+ GrProcessorDataManager*, GrFragmentProcessor** fp) const {
*fp = NULL;
SkColor skColor = fColor;
U8CPU newA = SkMulDiv255Round(SkColorGetA(fColor), paint.getAlpha());
@@ -358,7 +359,7 @@ bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const
#else
bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
- const SkMatrix*, GrColor*, GrShaderDataManager*,
+ const SkMatrix*, GrColor*, GrProcessorDataManager*,
GrFragmentProcessor**) const {
SkDEBUGFAIL("Should not call in GPU-less build");
return false;
« no previous file with comments | « src/core/SkPictureShader.cpp ('k') | src/core/SkXfermode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698