| 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 23 matching lines...) Expand all Loading... |
| 34 | 34 |
| 35 #include "SkFontMgr.h" | 35 #include "SkFontMgr.h" |
| 36 #include "SkTypeface_win.h" | 36 #include "SkTypeface_win.h" |
| 37 #include "platform/RuntimeEnabledFeatures.h" | 37 #include "platform/RuntimeEnabledFeatures.h" |
| 38 #include "platform/fonts/FontDescription.h" | 38 #include "platform/fonts/FontDescription.h" |
| 39 #include "platform/fonts/FontFaceCreationParams.h" | 39 #include "platform/fonts/FontFaceCreationParams.h" |
| 40 #include "platform/fonts/SimpleFontData.h" | 40 #include "platform/fonts/SimpleFontData.h" |
| 41 #include "platform/fonts/harfbuzz/FontPlatformDataHarfbuzz.h" | 41 #include "platform/fonts/harfbuzz/FontPlatformDataHarfbuzz.h" |
| 42 #include "platform/fonts/win/FontFallbackWin.h" | 42 #include "platform/fonts/win/FontFallbackWin.h" |
| 43 | 43 |
| 44 namespace WebCore { | 44 namespace blink { |
| 45 | 45 |
| 46 HashMap<String, SkTypeface*>* FontCache::s_sideloadedFonts = 0; | 46 HashMap<String, SkTypeface*>* FontCache::s_sideloadedFonts = 0; |
| 47 | 47 |
| 48 // static | 48 // static |
| 49 void FontCache::addSideloadedFontForTesting(SkTypeface* typeface) | 49 void FontCache::addSideloadedFontForTesting(SkTypeface* typeface) |
| 50 { | 50 { |
| 51 if (!s_sideloadedFonts) | 51 if (!s_sideloadedFonts) |
| 52 s_sideloadedFonts = new HashMap<String, SkTypeface*>; | 52 s_sideloadedFonts = new HashMap<String, SkTypeface*>; |
| 53 SkString name; | 53 SkString name; |
| 54 typeface->getFamilyName(&name); | 54 typeface->getFamilyName(&name); |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 if (typefacesMatchesFamily(tf.get(), entry.family)) { | 245 if (typefacesMatchesFamily(tf.get(), entry.family)) { |
| 246 result->setMinSizeForAntiAlias(entry.minSize); | 246 result->setMinSizeForAntiAlias(entry.minSize); |
| 247 break; | 247 break; |
| 248 } | 248 } |
| 249 } | 249 } |
| 250 | 250 |
| 251 return result; | 251 return result; |
| 252 } | 252 } |
| 253 | 253 |
| 254 } | 254 } |
| OLD | NEW |