| 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 14 matching lines...) Expand all  Loading... | 
| 25  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 25  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
| 26  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 26  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
| 27  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
| 28  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
| 29  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 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 "SkFontMgr.h" | 
|  | 36 #include "SkTypeface_win.h" | 
| 35 #include "core/platform/NotImplemented.h" | 37 #include "core/platform/NotImplemented.h" | 
| 36 #include "core/platform/graphics/Font.h" | 38 #include "core/platform/graphics/Font.h" | 
| 37 #include "core/platform/graphics/SimpleFontData.h" | 39 #include "core/platform/graphics/SimpleFontData.h" | 
| 38 #include "core/platform/graphics/chromium/FontPlatformDataChromiumWin.h" | 40 #include "core/platform/graphics/chromium/FontPlatformDataChromiumWin.h" | 
| 39 #include "core/platform/graphics/chromium/FontUtilsChromiumWin.h" | 41 #include "core/platform/graphics/chromium/FontUtilsChromiumWin.h" | 
| 40 | 42 | 
| 41 namespace WebCore { | 43 namespace WebCore { | 
| 42 | 44 | 
|  | 45 FontCache::FontCache() | 
|  | 46     : m_purgePreventCount(0) | 
|  | 47 { | 
|  | 48     m_fontManager = adoptPtr(SkFontMgr_New_GDI()); | 
|  | 49 } | 
|  | 50 | 
|  | 51 | 
| 43 static bool fontContainsCharacter(const FontPlatformData* fontData, const wchar_
     t* family, UChar32 character) | 52 static bool fontContainsCharacter(const FontPlatformData* fontData, const wchar_
     t* family, UChar32 character) | 
| 44 { | 53 { | 
| 45     SkPaint paint; | 54     SkPaint paint; | 
| 46     fontData->setupPaint(&paint); | 55     fontData->setupPaint(&paint); | 
| 47     paint.setTextEncoding(SkPaint::kUTF32_TextEncoding); | 56     paint.setTextEncoding(SkPaint::kUTF32_TextEncoding); | 
| 48 | 57 | 
| 49     uint16_t glyph; | 58     uint16_t glyph; | 
| 50     paint.textToGlyphs(&character, sizeof(character), &glyph); | 59     paint.textToGlyphs(&character, sizeof(character), &glyph); | 
| 51     return glyph != 0; | 60     return glyph != 0; | 
| 52 } | 61 } | 
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 186         name.data(), | 195         name.data(), | 
| 187         fontDescription.computedSize(), | 196         fontDescription.computedSize(), | 
| 188         fontDescription.weight() >= FontWeightBold && !tf->isBold(), | 197         fontDescription.weight() >= FontWeightBold && !tf->isBold(), | 
| 189         fontDescription.italic() && !tf->isItalic(), | 198         fontDescription.italic() && !tf->isItalic(), | 
| 190         fontDescription.orientation()); | 199         fontDescription.orientation()); | 
| 191     tf->unref(); | 200     tf->unref(); | 
| 192     return result; | 201     return result; | 
| 193 } | 202 } | 
| 194 | 203 | 
| 195 } | 204 } | 
| OLD | NEW | 
|---|