| 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 10 matching lines...) Expand all Loading... |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 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 "sky/engine/config.h" | |
| 32 #include "sky/engine/platform/fonts/FontCache.h" | 31 #include "sky/engine/platform/fonts/FontCache.h" |
| 33 | 32 |
| 34 #include "sky/engine/platform/Language.h" | 33 #include "sky/engine/platform/Language.h" |
| 35 #include "sky/engine/platform/fonts/FontDescription.h" | 34 #include "sky/engine/platform/fonts/FontDescription.h" |
| 36 #include "sky/engine/platform/fonts/FontFaceCreationParams.h" | 35 #include "sky/engine/platform/fonts/FontFaceCreationParams.h" |
| 37 #include "sky/engine/platform/fonts/SimpleFontData.h" | 36 #include "sky/engine/platform/fonts/SimpleFontData.h" |
| 38 #include "third_party/skia/include/core/SkTypeface.h" | 37 #include "third_party/skia/include/core/SkTypeface.h" |
| 39 #include "third_party/skia/include/ports/SkFontMgr.h" | 38 #include "third_party/skia/include/ports/SkFontMgr.h" |
| 40 | 39 |
| 41 namespace blink { | 40 namespace blink { |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 break; | 85 break; |
| 87 default: | 86 default: |
| 88 // For other scripts, use the default generic family mapping logic. | 87 // For other scripts, use the default generic family mapping logic. |
| 89 return familyName; | 88 return familyName; |
| 90 } | 89 } |
| 91 | 90 |
| 92 return getFamilyNameForCharacter(examplerChar, fontDescription); | 91 return getFamilyNameForCharacter(examplerChar, fontDescription); |
| 93 } | 92 } |
| 94 | 93 |
| 95 } // namespace blink | 94 } // namespace blink |
| OLD | NEW |