Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2012 Google Inc. All rights reser ved. | 2 * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2012 Google Inc. All rights reser ved. |
| 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 132 static const UChar* copticFonts[] = { L"Segoe UI Symbol", 0 }; | 132 static const UChar* copticFonts[] = { L"Segoe UI Symbol", 0 }; |
| 133 static const UChar* cuneiformFonts[] = { L"Segoe UI Historic", 0 }; | 133 static const UChar* cuneiformFonts[] = { L"Segoe UI Historic", 0 }; |
| 134 static const UChar* cypriotFonts[] = { L"Segoe UI Historic", 0 }; | 134 static const UChar* cypriotFonts[] = { L"Segoe UI Historic", 0 }; |
| 135 static const UChar* deseretFonts[] = { L"Segoe UI Symbol", 0 }; | 135 static const UChar* deseretFonts[] = { L"Segoe UI Symbol", 0 }; |
| 136 static const UChar* devanagariFonts[] = { L"Nirmala UI", L"Mangal", 0 }; | 136 static const UChar* devanagariFonts[] = { L"Nirmala UI", L"Mangal", 0 }; |
| 137 static const UChar* egyptianHieroglyphsFonts[] = { L"Segoe UI Historic", | 137 static const UChar* egyptianHieroglyphsFonts[] = { L"Segoe UI Historic", |
| 138 0 }; | 138 0 }; |
| 139 static const UChar* ethiopicFonts[] = { L"Nyala", L"Abyssinica SIL", | 139 static const UChar* ethiopicFonts[] = { L"Nyala", L"Abyssinica SIL", |
| 140 L"Ethiopia Jiret", L"Visual Geez Unicode", L"GF Zemen Unicode", | 140 L"Ethiopia Jiret", L"Visual Geez Unicode", L"GF Zemen Unicode", |
| 141 L"Ebrima", 0 }; | 141 L"Ebrima", 0 }; |
| 142 static const UChar* georgianFonts[] = { L"Segoe UI", L"Sylfaen", 0 }; | 142 static const UChar* georgianFonts[] = { L"Sylfaen", L"Segoe UI", 0 }; |
| 143 static const UChar* glagoliticFonts[] = { L"Segoe UI Historic", | 143 static const UChar* glagoliticFonts[] = { L"Segoe UI Historic", |
| 144 L"Segoe UI Symbol", 0 }; | 144 L"Segoe UI Symbol", 0 }; |
| 145 static const UChar* gothicFonts[] = { L"Segoe UI Historic", | 145 static const UChar* gothicFonts[] = { L"Segoe UI Historic", |
| 146 L"Segoe UI Symbol", 0 }; | 146 L"Segoe UI Symbol", 0 }; |
| 147 static const UChar* gujaratiFonts[] = { L"Nirmala UI", L"Shruti", 0 }; | 147 static const UChar* gujaratiFonts[] = { L"Nirmala UI", L"Shruti", 0 }; |
| 148 static const UChar* gurmukhiFonts[] = { L"Nirmala UI", L"Raavi", 0 }; | 148 static const UChar* gurmukhiFonts[] = { L"Nirmala UI", L"Raavi", 0 }; |
| 149 static const UChar* hangulFonts[] = { L"Malgun Gothic", L"Gulim", 0 }; | 149 static const UChar* hangulFonts[] = { L"Malgun Gothic", L"Gulim", 0 }; |
| 150 static const UChar* hebrewFonts[] = { L"David", L"Segoe UI", 0 }; | 150 static const UChar* hebrewFonts[] = { L"David", L"Segoe UI", 0 }; |
| 151 static const UChar* imperialAramaicFonts[] = { L"Segoe UI Historic", 0 }; | 151 static const UChar* imperialAramaicFonts[] = { L"Segoe UI Historic", 0 }; |
| 152 static const UChar* inscriptionalPahlaviFonts[] = { L"Segoe UI Historic", | 152 static const UChar* inscriptionalPahlaviFonts[] = { L"Segoe UI Historic", |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 406 switch (blockCode) { | 406 switch (blockCode) { |
| 407 case UBLOCK_EMOTICONS: | 407 case UBLOCK_EMOTICONS: |
| 408 case UBLOCK_ENCLOSED_ALPHANUMERIC_SUPPLEMENT: | 408 case UBLOCK_ENCLOSED_ALPHANUMERIC_SUPPLEMENT: |
| 409 return emojiFont; | 409 return emojiFont; |
| 410 case UBLOCK_PLAYING_CARDS: | 410 case UBLOCK_PLAYING_CARDS: |
| 411 case UBLOCK_MISCELLANEOUS_SYMBOLS: | 411 case UBLOCK_MISCELLANEOUS_SYMBOLS: |
| 412 case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_ARROWS: | 412 case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_ARROWS: |
| 413 case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS: | 413 case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS: |
| 414 case UBLOCK_TRANSPORT_AND_MAP_SYMBOLS: | 414 case UBLOCK_TRANSPORT_AND_MAP_SYMBOLS: |
| 415 case UBLOCK_ALCHEMICAL_SYMBOLS: | 415 case UBLOCK_ALCHEMICAL_SYMBOLS: |
| 416 case UBLOCK_RUNIC: | |
|
drott
2016/05/11 06:05:31
Why was this removed? Did it conflict with the Geo
eae
2016/05/11 16:07:27
No but the Runic font seleciton, that change lande
| |
| 417 case UBLOCK_DINGBATS: | 416 case UBLOCK_DINGBATS: |
| 418 case UBLOCK_GOTHIC: | 417 case UBLOCK_GOTHIC: |
| 419 return symbolFont; | 418 return symbolFont; |
| 420 case UBLOCK_ARROWS: | 419 case UBLOCK_ARROWS: |
| 421 case UBLOCK_MATHEMATICAL_OPERATORS: | 420 case UBLOCK_MATHEMATICAL_OPERATORS: |
| 422 case UBLOCK_MISCELLANEOUS_TECHNICAL: | 421 case UBLOCK_MISCELLANEOUS_TECHNICAL: |
| 423 case UBLOCK_GEOMETRIC_SHAPES: | 422 case UBLOCK_GEOMETRIC_SHAPES: |
| 424 case UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A: | 423 case UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A: |
| 425 case UBLOCK_SUPPLEMENTAL_ARROWS_A: | 424 case UBLOCK_SUPPLEMENTAL_ARROWS_A: |
| 426 case UBLOCK_SUPPLEMENTAL_ARROWS_B: | 425 case UBLOCK_SUPPLEMENTAL_ARROWS_B: |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 542 family = L"lucida sans unicode"; | 541 family = L"lucida sans unicode"; |
| 543 } | 542 } |
| 544 } | 543 } |
| 545 | 544 |
| 546 if (scriptChecked) | 545 if (scriptChecked) |
| 547 *scriptChecked = script; | 546 *scriptChecked = script; |
| 548 return family; | 547 return family; |
| 549 } | 548 } |
| 550 | 549 |
| 551 } // namespace blink | 550 } // namespace blink |
| OLD | NEW |