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

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: Make vc++ happy. 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
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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 WallTimer fTimer; 193 WallTimer fTimer;
194 double fMeasureFPS_Time; 194 double fMeasureFPS_Time;
195 bool fMagnify; 195 bool fMagnify;
196 int fTilingMode; 196 int fTilingMode;
197 197
198 // The following are for the 'fatbits' drawing 198 // The following are for the 'fatbits' drawing
199 // Latest position of the mouse. 199 // Latest position of the mouse.
200 int fMouseX, fMouseY; 200 int fMouseX, fMouseY;
201 int fFatBitsScale; 201 int fFatBitsScale;
202 // Used by the text showing position and color values. 202 // Used by the text showing position and color values.
203 SkTypeface* fTypeface; 203 sk_sp<SkTypeface> fTypeface;
204 bool fShowZoomer; 204 bool fShowZoomer;
205 205
206 SkOSMenu::TriState fLCDState; 206 SkOSMenu::TriState fLCDState;
207 SkOSMenu::TriState fAAState; 207 SkOSMenu::TriState fAAState;
208 SkOSMenu::TriState fSubpixelState; 208 SkOSMenu::TriState fSubpixelState;
209 int fHintingState; 209 int fHintingState;
210 int fPixelGeometryIndex; 210 int fPixelGeometryIndex;
211 int fFilterQualityIndex; 211 int fFilterQualityIndex;
212 unsigned fFlipAxis; 212 unsigned fFlipAxis;
213 213
(...skipping 19 matching lines...) Expand all
233 void postAnimatingEvent(); 233 void postAnimatingEvent();
234 int findByTitle(const char*); 234 int findByTitle(const char*);
235 void listTitles(); 235 void listTitles();
236 SkSize tileSize() const; 236 SkSize tileSize() const;
237 bool sendAnimatePulse(); 237 bool sendAnimatePulse();
238 238
239 typedef SkOSWindow INHERITED; 239 typedef SkOSWindow INHERITED;
240 }; 240 };
241 241
242 #endif 242 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698