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

Side by Side Diff: gm/constcolorprocessor.cpp

Issue 1089063002: Don't draw if SkShader::asNewFragmentProcessor fails. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix crash in pipe Created 5 years, 8 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 | « gm/badpaint.cpp ('k') | gyp/gmslides.gypi » ('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 /* 2 /*
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 // This test only works with the GPU backend. 9 // This test only works with the GPU backend.
10 10
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 return; 97 return;
98 } 98 }
99 99
100 GrPaint grPaint; 100 GrPaint grPaint;
101 SkPaint skPaint; 101 SkPaint skPaint;
102 if (paintType >= SK_ARRAY_COUNT(kPaintColors)) { 102 if (paintType >= SK_ARRAY_COUNT(kPaintColors)) {
103 skPaint.setShader(fShader); 103 skPaint.setShader(fShader);
104 } else { 104 } else {
105 skPaint.setColor(kPaintColors[paintType]); 105 skPaint.setColor(kPaintColors[paintType]);
106 } 106 }
107 SkPaint2GrPaintShader(context, rt, skPaint, viewMatrix, fals e, &grPaint); 107 SkAssertResult(SkPaint2GrPaint(context, rt, skPaint, viewMat rix, false,
108 &grPaint));
108 109
109 GrConstColorProcessor::InputMode mode = (GrConstColorProcess or::InputMode) m; 110 GrConstColorProcessor::InputMode mode = (GrConstColorProcess or::InputMode) m;
110 GrColor color = kColors[procColor]; 111 GrColor color = kColors[procColor];
111 SkAutoTUnref<GrFragmentProcessor> fp(GrConstColorProcessor:: Create(color, mode)); 112 SkAutoTUnref<GrFragmentProcessor> fp(GrConstColorProcessor:: Create(color, mode));
112 113
113 GrPipelineBuilder pipelineBuilder; 114 GrPipelineBuilder pipelineBuilder;
114 GrClip clip; 115 GrClip clip;
115 pipelineBuilder.setFromPaint(grPaint, rt, clip); 116 pipelineBuilder.setFromPaint(grPaint, rt, clip);
116 pipelineBuilder.addColorProcessor(fp); 117 pipelineBuilder.addColorProcessor(fp);
117 118
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 typedef GM INHERITED; 189 typedef GM INHERITED;
189 }; 190 };
190 191
191 const SkScalar ConstColorProcessor::kPad = 10.f; 192 const SkScalar ConstColorProcessor::kPad = 10.f;
192 const SkScalar ConstColorProcessor::kRectSize = 20.f; 193 const SkScalar ConstColorProcessor::kRectSize = 20.f;
193 194
194 DEF_GM( return SkNEW(ConstColorProcessor); ) 195 DEF_GM( return SkNEW(ConstColorProcessor); )
195 } 196 }
196 197
197 #endif 198 #endif
OLDNEW
« no previous file with comments | « gm/badpaint.cpp ('k') | gyp/gmslides.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698