| OLD | NEW |
| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 s_sideloadedFonts->set(name.c_str(), typeface); | 54 s_sideloadedFonts->set(name.c_str(), typeface); |
| 55 } | 55 } |
| 56 | 56 |
| 57 FontCache::FontCache() | 57 FontCache::FontCache() |
| 58 : m_purgePreventCount(0) | 58 : m_purgePreventCount(0) |
| 59 { | 59 { |
| 60 SkFontMgr* fontManager; | 60 SkFontMgr* fontManager; |
| 61 | 61 |
| 62 if (s_useDirectWrite) { | 62 if (s_useDirectWrite) { |
| 63 fontManager = SkFontMgr_New_DirectWrite(s_directWriteFactory); | 63 fontManager = SkFontMgr_New_DirectWrite(s_directWriteFactory); |
| 64 s_useSubpixelPositioning = RuntimeEnabledFeatures::subpixelFontScalingEn
abled(); |
| 64 } else { | 65 } else { |
| 65 fontManager = SkFontMgr_New_GDI(); | 66 fontManager = SkFontMgr_New_GDI(); |
| 66 // Subpixel text positioning is not supported by the GDI backend. | 67 // Subpixel text positioning is not supported by the GDI backend. |
| 67 s_useSubpixelPositioning = false; | 68 s_useSubpixelPositioning = false; |
| 68 } | 69 } |
| 69 | 70 |
| 70 ASSERT(fontManager); | 71 ASSERT(fontManager); |
| 71 m_fontManager = adoptPtr(fontManager); | 72 m_fontManager = adoptPtr(fontManager); |
| 72 } | 73 } |
| 73 | 74 |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 result->setMinSizeForAntiAlias( | 277 result->setMinSizeForAntiAlias( |
| 277 minSizeForAntiAlias(fontDescription.script())); | 278 minSizeForAntiAlias(fontDescription.script())); |
| 278 if (fontRequiresFullHinting(family)) | 279 if (fontRequiresFullHinting(family)) |
| 279 result->setHinting(SkPaint::kFull_Hinting); | 280 result->setHinting(SkPaint::kFull_Hinting); |
| 280 } | 281 } |
| 281 | 282 |
| 282 return result; | 283 return result; |
| 283 } | 284 } |
| 284 | 285 |
| 285 } | 286 } |
| OLD | NEW |