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

Side by Side Diff: src/core/SkTextToPathIter.h

Issue 12915007: Fix a few clang errors while trying to build tools target. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rm SkAutoMemoryUsageProbe Created 7 years, 9 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 | « src/core/SkRasterClip.h ('k') | src/core/SkUtils.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 2012 Google Inc. 2 * Copyright 2012 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 #ifndef SkTextToPathIter_DEFINED 8 #ifndef SkTextToPathIter_DEFINED
9 #define SkTextToPathIter_DEFINED 9 #define SkTextToPathIter_DEFINED
10 10
(...skipping 23 matching lines...) Expand all
34 34
35 private: 35 private:
36 SkGlyphCache* fCache; 36 SkGlyphCache* fCache;
37 SkPaint fPaint; 37 SkPaint fPaint;
38 SkScalar fScale; 38 SkScalar fScale;
39 SkFixed fPrevAdvance; 39 SkFixed fPrevAdvance;
40 const char* fText; 40 const char* fText;
41 const char* fStop; 41 const char* fStop;
42 SkMeasureCacheProc fGlyphCacheProc; 42 SkMeasureCacheProc fGlyphCacheProc;
43 43
44 const SkPath* fPath; // returned in next
45 SkScalar fXPos; // accumulated xpos, returned in next 44 SkScalar fXPos; // accumulated xpos, returned in next
46 SkAutoKern fAutoKern; 45 SkAutoKern fAutoKern;
47 int fXYIndex; // cache for horizontal -vs- vertical text 46 int fXYIndex; // cache for horizontal -vs- vertical text
48 }; 47 };
49 48
50 #endif 49 #endif
OLDNEW
« no previous file with comments | « src/core/SkRasterClip.h ('k') | src/core/SkUtils.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698