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

Side by Side Diff: src/core/SkTextBlob.cpp

Issue 1192413005: Remove distance field flag from SkPaint (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 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 | « src/core/SkPaint.cpp ('k') | src/gpu/GrAtlasTextContext.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 2014 Google Inc. 2 * Copyright 2014 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 "SkTextBlob.h" 8 #include "SkTextBlob.h"
9 9
10 #include "SkReadBuffer.h" 10 #include "SkReadBuffer.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 SkPaint::kUnderlineText_Flag | 56 SkPaint::kUnderlineText_Flag |
57 SkPaint::kStrikeThruText_Flag | 57 SkPaint::kStrikeThruText_Flag |
58 SkPaint::kFakeBoldText_Flag | 58 SkPaint::kFakeBoldText_Flag |
59 SkPaint::kLinearText_Flag | 59 SkPaint::kLinearText_Flag |
60 SkPaint::kSubpixelText_Flag | 60 SkPaint::kSubpixelText_Flag |
61 SkPaint::kDevKernText_Flag | 61 SkPaint::kDevKernText_Flag |
62 SkPaint::kLCDRenderText_Flag | 62 SkPaint::kLCDRenderText_Flag |
63 SkPaint::kEmbeddedBitmapText_Flag | 63 SkPaint::kEmbeddedBitmapText_Flag |
64 SkPaint::kAutoHinting_Flag | 64 SkPaint::kAutoHinting_Flag |
65 SkPaint::kVerticalText_Flag | 65 SkPaint::kVerticalText_Flag |
66 SkPaint::kGenA8FromLCD_Flag | 66 SkPaint::kGenA8FromLCD_Flag;
67 SkPaint::kDistanceFieldTextTEMP_Flag;
68 67
69 SkScalar fSize; 68 SkScalar fSize;
70 SkScalar fScaleX; 69 SkScalar fScaleX;
71 70
72 // Keep this SkAutoTUnref off the first position, to avoid interfering with SkNoncopyable 71 // Keep this SkAutoTUnref off the first position, to avoid interfering with SkNoncopyable
73 // empty baseclass optimization (http://code.google.com/p/skia/issues/detail ?id=3694). 72 // empty baseclass optimization (http://code.google.com/p/skia/issues/detail ?id=3694).
74 SkAutoTUnref<SkTypeface> fTypeface; 73 SkAutoTUnref<SkTypeface> fTypeface;
75 SkScalar fSkewX; 74 SkScalar fSkewX;
76 75
77 SK_COMPILE_ASSERT(SkPaint::kFull_Hinting < 4, insufficient_hinting_bits); 76 SK_COMPILE_ASSERT(SkPaint::kFull_Hinting < 4, insufficient_hinting_bits);
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 600
602 fStorageUsed = 0; 601 fStorageUsed = 0;
603 fStorageSize = 0; 602 fStorageSize = 0;
604 fRunCount = 0; 603 fRunCount = 0;
605 fLastRun = 0; 604 fLastRun = 0;
606 fBounds.setEmpty(); 605 fBounds.setEmpty();
607 606
608 return blob; 607 return blob;
609 } 608 }
610 609
OLDNEW
« no previous file with comments | « src/core/SkPaint.cpp ('k') | src/gpu/GrAtlasTextContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698