| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2011 Google Inc. All rights reserved. | 2 * Copyright (c) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "platform/fonts/FontCache.h" | 31 #include "platform/fonts/FontCache.h" |
| 32 | 32 |
| 33 #include "platform/Language.h" | 33 #include "platform/Language.h" |
| 34 #include "platform/fonts/SimpleFontData.h" | |
| 35 #include "platform/fonts/FontDescription.h" | 34 #include "platform/fonts/FontDescription.h" |
| 36 #include "platform/fonts/FontFaceCreationParams.h" | 35 #include "platform/fonts/FontFaceCreationParams.h" |
| 36 #include "platform/fonts/SimpleFontData.h" |
| 37 #include "third_party/skia/include/core/SkTypeface.h" | 37 #include "third_party/skia/include/core/SkTypeface.h" |
| 38 #include "third_party/skia/include/ports/SkFontMgr.h" | 38 #include "third_party/skia/include/ports/SkFontMgr.h" |
| 39 | 39 |
| 40 namespace blink { | 40 namespace blink { |
| 41 | 41 |
| 42 static AtomicString defaultFontFamily(SkFontMgr* fontManager) { | 42 static AtomicString defaultFontFamily(SkFontMgr* fontManager) { |
| 43 // Pass nullptr to get the default typeface. The default typeface in Android | 43 // Pass nullptr to get the default typeface. The default typeface in Android |
| 44 // is "sans-serif" if exists, or the first entry in fonts.xml. | 44 // is "sans-serif" if exists, or the first entry in fonts.xml. |
| 45 sk_sp<SkTypeface> typeface( | 45 sk_sp<SkTypeface> typeface( |
| 46 fontManager->legacyCreateTypeface(nullptr, SkFontStyle())); | 46 fontManager->legacyCreateTypeface(nullptr, SkFontStyle())); |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 // For other scripts, use the default generic family mapping logic. | 125 // For other scripts, use the default generic family mapping logic. |
| 126 return familyName; | 126 return familyName; |
| 127 } | 127 } |
| 128 | 128 |
| 129 sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault()); | 129 sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault()); |
| 130 return getFamilyNameForCharacter(fm.get(), examplerChar, fontDescription, | 130 return getFamilyNameForCharacter(fm.get(), examplerChar, fontDescription, |
| 131 FontFallbackPriority::Text); | 131 FontFallbackPriority::Text); |
| 132 } | 132 } |
| 133 | 133 |
| 134 } // namespace blink | 134 } // namespace blink |
| OLD | NEW |