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

Side by Side Diff: samplecode/SampleApp.h

Issue 1933393002: Move SkTypeface to sk_sp. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Restore deleted Android code. Created 4 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 | « samplecode/SampleAnimatedText.cpp ('k') | samplecode/SampleApp.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 Skia 2 * Copyright 2011 Skia
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 #ifndef SampleApp_DEFINED 8 #ifndef SampleApp_DEFINED
9 #define SampleApp_DEFINED 9 #define SampleApp_DEFINED
10 10
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 WallTimer fTimer; 197 WallTimer fTimer;
198 double fMeasureFPS_Time; 198 double fMeasureFPS_Time;
199 bool fMagnify; 199 bool fMagnify;
200 int fTilingMode; 200 int fTilingMode;
201 201
202 // The following are for the 'fatbits' drawing 202 // The following are for the 'fatbits' drawing
203 // Latest position of the mouse. 203 // Latest position of the mouse.
204 int fMouseX, fMouseY; 204 int fMouseX, fMouseY;
205 int fFatBitsScale; 205 int fFatBitsScale;
206 // Used by the text showing position and color values. 206 // Used by the text showing position and color values.
207 SkTypeface* fTypeface; 207 sk_sp<SkTypeface> fTypeface;
208 bool fShowZoomer; 208 bool fShowZoomer;
209 209
210 SkOSMenu::TriState fLCDState; 210 SkOSMenu::TriState fLCDState;
211 SkOSMenu::TriState fAAState; 211 SkOSMenu::TriState fAAState;
212 SkOSMenu::TriState fSubpixelState; 212 SkOSMenu::TriState fSubpixelState;
213 int fHintingState; 213 int fHintingState;
214 int fPixelGeometryIndex; 214 int fPixelGeometryIndex;
215 int fFilterQualityIndex; 215 int fFilterQualityIndex;
216 unsigned fFlipAxis; 216 unsigned fFlipAxis;
217 217
(...skipping 20 matching lines...) Expand all
238 void postAnimatingEvent(); 238 void postAnimatingEvent();
239 int findByTitle(const char*); 239 int findByTitle(const char*);
240 void listTitles(); 240 void listTitles();
241 SkSize tileSize() const; 241 SkSize tileSize() const;
242 bool sendAnimatePulse(); 242 bool sendAnimatePulse();
243 243
244 typedef SkOSWindow INHERITED; 244 typedef SkOSWindow INHERITED;
245 }; 245 };
246 246
247 #endif 247 #endif
OLDNEW
« no previous file with comments | « samplecode/SampleAnimatedText.cpp ('k') | samplecode/SampleApp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698