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

Side by Side Diff: gm/complexclip2.cpp

Issue 281383013: skiagm::make_isize -> SkISize::Make (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 7 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/complexclip.cpp ('k') | gm/convexpaths.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 2011 Google Inc. 2 * Copyright 2011 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 8
9 #include "gm.h" 9 #include "gm.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 } 124 }
125 125
126 SkString str; 126 SkString str;
127 str.printf("complexclip2_%s_%s", 127 str.printf("complexclip2_%s_%s",
128 ClipStr(fClip), 128 ClipStr(fClip),
129 fAntiAlias ? "aa" : "bw"); 129 fAntiAlias ? "aa" : "bw");
130 return str; 130 return str;
131 } 131 }
132 132
133 virtual SkISize onISize() { 133 virtual SkISize onISize() {
134 return make_isize(SkScalarRoundToInt(fTotalWidth), 134 return SkISize::Make(SkScalarRoundToInt(fTotalWidth),
135 SkScalarRoundToInt(fTotalHeight)); 135 SkScalarRoundToInt(fTotalHeight));
136 } 136 }
137 137
138 virtual void onDraw(SkCanvas* canvas) { 138 virtual void onDraw(SkCanvas* canvas) {
139 SkPaint rectPaint; 139 SkPaint rectPaint;
140 rectPaint.setStyle(SkPaint::kStroke_Style); 140 rectPaint.setStyle(SkPaint::kStroke_Style);
141 rectPaint.setStrokeWidth(-1); 141 rectPaint.setStrokeWidth(-1);
142 142
143 SkPaint fillPaint; 143 SkPaint fillPaint;
144 fillPaint.setColor(SkColorSetRGB(0xA0,0xDD,0xA0)); 144 fillPaint.setColor(SkColorSetRGB(0xA0,0xDD,0xA0));
145 145
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRect_Clip, false); ) 213 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRect_Clip, false); )
214 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRRect_Clip, false); ) 214 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRRect_Clip, false); )
215 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kPath_Clip, false); ) 215 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kPath_Clip, false); )
216 216
217 // aa 217 // aa
218 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRect_Clip, true); ) 218 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRect_Clip, true); )
219 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRRect_Clip, true); ) 219 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRRect_Clip, true); )
220 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kPath_Clip, true); ) 220 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kPath_Clip, true); )
221 221
222 } 222 }
OLDNEW
« no previous file with comments | « gm/complexclip.cpp ('k') | gm/convexpaths.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698