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

Side by Side Diff: src/core/SkColorFilter.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 unified diff | Download patch
« no previous file with comments | « src/core/SkBitmapProcShader.cpp ('k') | src/core/SkColorShader.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkColorFilter.h" 8 #include "SkColorFilter.h"
9 #include "SkReadBuffer.h" 9 #include "SkReadBuffer.h"
10 #include "SkString.h" 10 #include "SkString.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #ifndef SK_IGNORE_TO_STRING 55 #ifndef SK_IGNORE_TO_STRING
56 void toString(SkString* str) const override { 56 void toString(SkString* str) const override {
57 SkString outerS, innerS; 57 SkString outerS, innerS;
58 fOuter->toString(&outerS); 58 fOuter->toString(&outerS);
59 fInner->toString(&innerS); 59 fInner->toString(&innerS);
60 str->appendf("SkComposeColorFilter: outer(%s) inner(%s)", outerS.c_str() , innerS.c_str()); 60 str->appendf("SkComposeColorFilter: outer(%s) inner(%s)", outerS.c_str() , innerS.c_str());
61 } 61 }
62 #endif 62 #endif
63 63
64 #if SK_SUPPORT_GPU 64 #if SK_SUPPORT_GPU
65 bool asFragmentProcessors(GrContext* context, GrShaderDataManager* shaderDat aManager, 65 bool asFragmentProcessors(GrContext* context, GrProcessorDataManager* procDa taManager,
66 SkTDArray<GrFragmentProcessor*>* array) const over ride { 66 SkTDArray<GrFragmentProcessor*>* array) const over ride {
67 bool hasFrags = fInner->asFragmentProcessors(context, shaderDataManager, array); 67 bool hasFrags = fInner->asFragmentProcessors(context, procDataManager, a rray);
68 hasFrags |= fOuter->asFragmentProcessors(context, shaderDataManager, arr ay); 68 hasFrags |= fOuter->asFragmentProcessors(context, procDataManager, array );
69 return hasFrags; 69 return hasFrags;
70 } 70 }
71 #endif 71 #endif
72 72
73 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeColorFilter) 73 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeColorFilter)
74 74
75 protected: 75 protected:
76 void flatten(SkWriteBuffer& buffer) const override { 76 void flatten(SkWriteBuffer& buffer) const override {
77 buffer.writeFlattenable(fOuter); 77 buffer.writeFlattenable(fOuter);
78 buffer.writeFlattenable(fInner); 78 buffer.writeFlattenable(fInner);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 if (count > SK_MAX_COMPOSE_COLORFILTER_COUNT) { 127 if (count > SK_MAX_COMPOSE_COLORFILTER_COUNT) {
128 return NULL; 128 return NULL;
129 } 129 }
130 return SkNEW_ARGS(SkComposeColorFilter, (outer, inner, count)); 130 return SkNEW_ARGS(SkComposeColorFilter, (outer, inner, count));
131 } 131 }
132 132
133 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter) 133 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter)
134 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeColorFilter) 134 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeColorFilter)
135 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END 135 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
136 136
OLDNEW
« no previous file with comments | « src/core/SkBitmapProcShader.cpp ('k') | src/core/SkColorShader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698