| 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 19 matching lines...) Expand all  Loading... | 
| 30  */ | 30  */ | 
| 31 | 31 | 
| 32 #include "config.h" | 32 #include "config.h" | 
| 33 #include "core/platform/graphics/FontCache.h" | 33 #include "core/platform/graphics/FontCache.h" | 
| 34 | 34 | 
| 35 #include "RuntimeEnabledFeatures.h" | 35 #include "RuntimeEnabledFeatures.h" | 
| 36 #include "SkFontMgr.h" | 36 #include "SkFontMgr.h" | 
| 37 #include "SkTypeface_win.h" | 37 #include "SkTypeface_win.h" | 
| 38 #include "core/platform/graphics/Font.h" | 38 #include "core/platform/graphics/Font.h" | 
| 39 #include "core/platform/graphics/SimpleFontData.h" | 39 #include "core/platform/graphics/SimpleFontData.h" | 
| 40 #include "core/platform/graphics/chromium/FontFallbackWin.h" |  | 
| 41 #include "core/platform/graphics/chromium/FontPlatformDataChromiumWin.h" | 40 #include "core/platform/graphics/chromium/FontPlatformDataChromiumWin.h" | 
|  | 41 #include "platform/fonts/FontFallbackWin.h" | 
| 42 | 42 | 
| 43 namespace WebCore { | 43 namespace WebCore { | 
| 44 | 44 | 
| 45 FontCache::FontCache() | 45 FontCache::FontCache() | 
| 46     : m_purgePreventCount(0) | 46     : m_purgePreventCount(0) | 
| 47 { | 47 { | 
| 48     SkFontMgr* fontManager = 0; | 48     SkFontMgr* fontManager = 0; | 
| 49 | 49 | 
| 50     // Prefer DirectWrite (if runtime feature is enabled) but fallback | 50     // Prefer DirectWrite (if runtime feature is enabled) but fallback | 
| 51     // to GDI on platforms where DirectWrite is not supported. | 51     // to GDI on platforms where DirectWrite is not supported. | 
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 205     FontPlatformData* result = new FontPlatformData(tf, | 205     FontPlatformData* result = new FontPlatformData(tf, | 
| 206         name.data(), | 206         name.data(), | 
| 207         fontSize, | 207         fontSize, | 
| 208         fontDescription.weight() >= FontWeightBold && !tf->isBold(), | 208         fontDescription.weight() >= FontWeightBold && !tf->isBold(), | 
| 209         fontDescription.italic() && !tf->isItalic(), | 209         fontDescription.italic() && !tf->isItalic(), | 
| 210         fontDescription.orientation()); | 210         fontDescription.orientation()); | 
| 211     return result; | 211     return result; | 
| 212 } | 212 } | 
| 213 | 213 | 
| 214 } | 214 } | 
| OLD | NEW | 
|---|