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

Side by Side Diff: gm/aaclip.cpp

Issue 831113002: Cleanup: More override fixes - another round. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 11 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 | « bench/ScalarBench.cpp ('k') | gm/aarectmodes.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 #include "gm.h" 8 #include "gm.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkPath.h" 10 #include "SkPath.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 canvas->translate(SK_Scalar1 / 5, SK_Scalar1 / 5); 95 canvas->translate(SK_Scalar1 / 5, SK_Scalar1 / 5);
96 canvas->translate(SkIntToScalar(50), 0); 96 canvas->translate(SkIntToScalar(50), 0);
97 draw_rect_tests(canvas); 97 draw_rect_tests(canvas);
98 98
99 canvas->translate(SK_Scalar1 / 5, SK_Scalar1 / 5); 99 canvas->translate(SK_Scalar1 / 5, SK_Scalar1 / 5);
100 canvas->translate(SkIntToScalar(50), 0); 100 canvas->translate(SkIntToScalar(50), 0);
101 draw_rect_tests(canvas); 101 draw_rect_tests(canvas);
102 } 102 }
103 103
104 virtual uint32_t onGetFlags() const { return kSkipPipe_Flag; } 104 virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; }
105 105
106 private: 106 private:
107 typedef skiagm::GM INHERITED; 107 typedef skiagm::GM INHERITED;
108 }; 108 };
109 109
110 DEF_GM( return SkNEW(AAClipGM); ) 110 DEF_GM( return SkNEW(AAClipGM); )
111 111
112 ///////////////////////////////////////////////////////////////////////// 112 /////////////////////////////////////////////////////////////////////////
113 113
114 #ifdef SK_BUILD_FOR_MAC 114 #ifdef SK_BUILD_FOR_MAC
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; } 190 virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; }
191 191
192 private: 192 private:
193 typedef skiagm::GM INHERITED; 193 typedef skiagm::GM INHERITED;
194 }; 194 };
195 195
196 #if 0 // Disabled pending fix from reed@ 196 #if 0 // Disabled pending fix from reed@
197 DEF_GM( return SkNEW(CGImageGM); ) 197 DEF_GM( return SkNEW(CGImageGM); )
198 #endif 198 #endif
199 #endif 199 #endif
OLDNEW
« no previous file with comments | « bench/ScalarBench.cpp ('k') | gm/aarectmodes.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698