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

Side by Side Diff: gm/gm.h

Issue 14234022: GM::height() now returns the height, not the width. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 2011 Google Inc. 3 * Copyright 2011 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 #ifndef skiagm_DEFINED 8 #ifndef skiagm_DEFINED
9 #define skiagm_DEFINED 9 #define skiagm_DEFINED
10 10
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 const char* shortName(); 51 const char* shortName();
52 52
53 uint32_t getFlags() const { 53 uint32_t getFlags() const {
54 return this->onGetFlags(); 54 return this->onGetFlags();
55 } 55 }
56 56
57 SkScalar width() { 57 SkScalar width() {
58 return SkIntToScalar(this->getISize().width()); 58 return SkIntToScalar(this->getISize().width());
59 } 59 }
60 SkScalar height() { 60 SkScalar height() {
61 return SkIntToScalar(this->getISize().width()); 61 return SkIntToScalar(this->getISize().height());
62 } 62 }
63 63
64 // TODO(vandebo) Instead of exposing this, we should run all the GMs 64 // TODO(vandebo) Instead of exposing this, we should run all the GMs
65 // with and without an initial transform. 65 // with and without an initial transform.
66 // Most GMs will return the identity matrix, but some PDFs tests 66 // Most GMs will return the identity matrix, but some PDFs tests
67 // require setting the initial transform. 67 // require setting the initial transform.
68 SkMatrix getInitialTransform() const { 68 SkMatrix getInitialTransform() const {
69 return this->onGetInitialTransform(); 69 return this->onGetInitialTransform();
70 } 70 }
71 71
(...skipping 28 matching lines...) Expand all
100 SkString fShortName; 100 SkString fShortName;
101 SkColor fBGColor; 101 SkColor fBGColor;
102 bool fCanvasIsDeferred; // work-around problem in srcmode.cpp 102 bool fCanvasIsDeferred; // work-around problem in srcmode.cpp
103 bool fHaveCalledOnceBeforeDraw; 103 bool fHaveCalledOnceBeforeDraw;
104 }; 104 };
105 105
106 typedef SkTRegistry<GM*, void*> GMRegistry; 106 typedef SkTRegistry<GM*, void*> GMRegistry;
107 } 107 }
108 108
109 #endif 109 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698