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

Side by Side Diff: third_party/WebKit/Source/platform/fonts/win/FontPlatformDataWin.cpp

Issue 1518893003: SkPaint::kGenA8FromLCD_Flagis no longer used, so remove references to it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 (C) 2006, 2007 Apple Computer, Inc. 2 * Copyright (C) 2006, 2007 Apple Computer, Inc.
3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved. 3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 { 48 {
49 const float ts = m_textSize >= 0 ? m_textSize : 12; 49 const float ts = m_textSize >= 0 ? m_textSize : 12;
50 paint->setTextSize(SkFloatToScalar(m_textSize)); 50 paint->setTextSize(SkFloatToScalar(m_textSize));
51 paint->setTypeface(typeface()); 51 paint->setTypeface(typeface());
52 paint->setFakeBoldText(m_syntheticBold); 52 paint->setFakeBoldText(m_syntheticBold);
53 paint->setTextSkewX(m_syntheticItalic ? -SK_Scalar1 / 4 : 0); 53 paint->setTextSkewX(m_syntheticItalic ? -SK_Scalar1 / 4 : 0);
54 54
55 uint32_t textFlags = paintTextFlags(); 55 uint32_t textFlags = paintTextFlags();
56 uint32_t flags = paint->getFlags(); 56 uint32_t flags = paint->getFlags();
57 static const uint32_t textFlagsMask = SkPaint::kAntiAlias_Flag | 57 static const uint32_t textFlagsMask = SkPaint::kAntiAlias_Flag |
58 SkPaint::kLCDRenderText_Flag | 58 SkPaint::kLCDRenderText_Flag;
59 SkPaint::kGenA8FromLCD_Flag;
60 flags &= ~textFlagsMask; 59 flags &= ~textFlagsMask;
61 60
62 if (ts <= kMaxSizeForEmbeddedBitmap) 61 if (ts <= kMaxSizeForEmbeddedBitmap)
63 flags |= SkPaint::kEmbeddedBitmapText_Flag; 62 flags |= SkPaint::kEmbeddedBitmapText_Flag;
64 63
65 if (ts >= m_minSizeForAntiAlias) { 64 if (ts >= m_minSizeForAntiAlias) {
66 65
67 if (m_useSubpixelPositioning 66 if (m_useSubpixelPositioning
68 // Disable subpixel text for certain older fonts at smaller sizes as 67 // Disable subpixel text for certain older fonts at smaller sizes as
69 // they tend to get quite blurry at non-integer sizes and positions. 68 // they tend to get quite blurry at non-integer sizes and positions.
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 { 148 {
150 m_paintTextFlags = computePaintTextFlags(fontFamilyName()); 149 m_paintTextFlags = computePaintTextFlags(fontFamilyName());
151 } 150 }
152 151
153 bool FontPlatformData::defaultUseSubpixelPositioning() 152 bool FontPlatformData::defaultUseSubpixelPositioning()
154 { 153 {
155 return FontCache::fontCache()->useSubpixelPositioning(); 154 return FontCache::fontCache()->useSubpixelPositioning();
156 } 155 }
157 156
158 } // namespace blink 157 } // namespace blink
OLDNEW
« no previous file with comments | « skia/ext/benchmarking_canvas.cc ('k') | third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698