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

Side by Side Diff: gm/gm.cpp

Issue 320733002: Revert of Clean up Test's resourcePath code. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 6 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/gm.h ('k') | tests/Test.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 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
10 using namespace skiagm; 9 using namespace skiagm;
11 10
12 const char* GM::gResourcePath; 11 SkString GM::gResourcePath;
13 12
14 GM::GM() { 13 GM::GM() {
15 fMode = kGM_Mode; 14 fMode = kGM_Mode;
16 fBGColor = SK_ColorWHITE; 15 fBGColor = SK_ColorWHITE;
17 fCanvasIsDeferred = false; 16 fCanvasIsDeferred = false;
18 fHaveCalledOnceBeforeDraw = false; 17 fHaveCalledOnceBeforeDraw = false;
19 fStarterMatrix.reset(); 18 fStarterMatrix.reset();
20 } 19 }
21
22 GM::~GM() {} 20 GM::~GM() {}
23 21
24 void GM::draw(SkCanvas* canvas) { 22 void GM::draw(SkCanvas* canvas) {
25 this->drawBackground(canvas); 23 this->drawBackground(canvas);
26 this->drawContent(canvas); 24 this->drawContent(canvas);
27 } 25 }
28 26
29 void GM::drawContent(SkCanvas* canvas) { 27 void GM::drawContent(SkCanvas* canvas) {
30 if (!fHaveCalledOnceBeforeDraw) { 28 if (!fHaveCalledOnceBeforeDraw) {
31 fHaveCalledOnceBeforeDraw = true; 29 fHaveCalledOnceBeforeDraw = true;
(...skipping 27 matching lines...) Expand all
59 57
60 void GM::drawSizeBounds(SkCanvas* canvas, SkColor color) { 58 void GM::drawSizeBounds(SkCanvas* canvas, SkColor color) {
61 SkISize size = this->getISize(); 59 SkISize size = this->getISize();
62 SkRect r = SkRect::MakeWH(SkIntToScalar(size.width()), 60 SkRect r = SkRect::MakeWH(SkIntToScalar(size.width()),
63 SkIntToScalar(size.height())); 61 SkIntToScalar(size.height()));
64 SkPaint paint; 62 SkPaint paint;
65 paint.setColor(color); 63 paint.setColor(color);
66 canvas->drawRect(r, paint); 64 canvas->drawRect(r, paint);
67 } 65 }
68 66
69 void GM::SetResourcePath(const char* resourcePath) {
70 gResourcePath = resourcePath;
71 }
72
73 SkString GM::GetResourcePath() {
74 return SkString(gResourcePath);
75 }
76
77 // need to explicitly declare this, or we get some weird infinite loop llist 67 // need to explicitly declare this, or we get some weird infinite loop llist
78 template GMRegistry* SkTRegistry<GM*(*)(void*)>::gHead; 68 template GMRegistry* SkTRegistry<GM*(*)(void*)>::gHead;
OLDNEW
« no previous file with comments | « gm/gm.h ('k') | tests/Test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698