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

Side by Side Diff: src/core/SkLocalMatrixShader.h

Issue 808703006: remove view matrix from context (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: one more fix Created 6 years 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/SkImageFilter.cpp ('k') | src/core/SkMaskFilter.cpp » ('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 2014 Google Inc. 2 * Copyright 2014 Google Inc.
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 #ifndef SkLocalMatrixShader_DEFINED 8 #ifndef SkLocalMatrixShader_DEFINED
9 #define SkLocalMatrixShader_DEFINED 9 #define SkLocalMatrixShader_DEFINED
10 10
(...skipping 17 matching lines...) Expand all
28 return fProxyShader->asABitmap(bitmap, matrix, mode); 28 return fProxyShader->asABitmap(bitmap, matrix, mode);
29 } 29 }
30 30
31 virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE { 31 virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE {
32 return fProxyShader->asAGradient(info); 32 return fProxyShader->asAGradient(info);
33 } 33 }
34 34
35 #if SK_SUPPORT_GPU 35 #if SK_SUPPORT_GPU
36 36
37 virtual bool asFragmentProcessor(GrContext* context, const SkPaint& paint, 37 virtual bool asFragmentProcessor(GrContext* context, const SkPaint& paint,
38 const SkMatrix* localMatrix, GrColor* grCol or, 38 const SkMatrix& viewM, const SkMatrix* loca lMatrix,
39 GrFragmentProcessor** fp) const SK_OVERRIDE { 39 GrColor* grColor, GrFragmentProcessor** fp) const SK_OVERRIDE {
40 SkMatrix tmp = this->getLocalMatrix(); 40 SkMatrix tmp = this->getLocalMatrix();
41 if (localMatrix) { 41 if (localMatrix) {
42 tmp.preConcat(*localMatrix); 42 tmp.preConcat(*localMatrix);
43 } 43 }
44 return fProxyShader->asFragmentProcessor(context, paint, &tmp, grColor, fp); 44 return fProxyShader->asFragmentProcessor(context, paint, viewM, &tmp, gr Color, fp);
45 } 45 }
46 46
47 #else 47 #else
48 48
49 virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix* , GrColor*, 49 virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& ,
50 const SkMatrix*, GrColor*,
50 GrFragmentProcessor**) const SK_OVERRIDE { 51 GrFragmentProcessor**) const SK_OVERRIDE {
51 SkDEBUGFAIL("Should not call in GPU-less build"); 52 SkDEBUGFAIL("Should not call in GPU-less build");
52 return false; 53 return false;
53 } 54 }
54 55
55 #endif 56 #endif
56 57
57 virtual SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const SK_OV ERRIDE { 58 virtual SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const SK_OV ERRIDE {
58 if (localMatrix) { 59 if (localMatrix) {
59 *localMatrix = this->getLocalMatrix(); 60 *localMatrix = this->getLocalMatrix();
60 } 61 }
61 return SkRef(fProxyShader.get()); 62 return SkRef(fProxyShader.get());
62 } 63 }
63 64
64 SK_TO_STRING_OVERRIDE() 65 SK_TO_STRING_OVERRIDE()
65 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixShader) 66 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixShader)
66 67
67 protected: 68 protected:
68 virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; 69 virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
69 virtual Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE ; 70 virtual Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE ;
70 71
71 private: 72 private:
72 SkAutoTUnref<SkShader> fProxyShader; 73 SkAutoTUnref<SkShader> fProxyShader;
73 74
74 typedef SkShader INHERITED; 75 typedef SkShader INHERITED;
75 }; 76 };
76 77
77 #endif 78 #endif
OLDNEW
« no previous file with comments | « src/core/SkImageFilter.cpp ('k') | src/core/SkMaskFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698