| Index: third_party/WebKit/Source/platform/text/UnicodeRange.cpp
|
| diff --git a/third_party/WebKit/Source/platform/text/UnicodeRange.cpp b/third_party/WebKit/Source/platform/text/UnicodeRange.cpp
|
| index ae01dde935f15b3fa74c4e1efe2560775a71a458..0829e1ba8e58b42fa9021a6cb746e973ba90eb06 100644
|
| --- a/third_party/WebKit/Source/platform/text/UnicodeRange.cpp
|
| +++ b/third_party/WebKit/Source/platform/text/UnicodeRange.cpp
|
| @@ -15,7 +15,7 @@
|
| *
|
| * You should have received a copy of the GNU Lesser General Public
|
| * License along with this library; if not, write to the Free Software
|
| - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
| + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
| *
|
| * Alternatively, the contents of this file may be used under the terms
|
| * of either the Mozilla Public License Version 1.1, found at
|
| @@ -177,183 +177,185 @@ namespace blink {
|
| static const unsigned cNumSubTables = 9;
|
| static const unsigned cSubTableSize = 16;
|
|
|
| -static const unsigned char gUnicodeSubrangeTable[cNumSubTables][cSubTableSize] = {
|
| +static const unsigned char gUnicodeSubrangeTable[cNumSubTables][cSubTableSize] =
|
| {
|
| - // table for X---
|
| - cRangeTableBase + 1, //u0xxx
|
| - cRangeTableBase + 2, //u1xxx
|
| - cRangeTableBase + 3, //u2xxx
|
| - cRangeSetCJK, //u3xxx
|
| - cRangeSetCJK, //u4xxx
|
| - cRangeSetCJK, //u5xxx
|
| - cRangeSetCJK, //u6xxx
|
| - cRangeSetCJK, //u7xxx
|
| - cRangeSetCJK, //u8xxx
|
| - cRangeSetCJK, //u9xxx
|
| - cRangeTableBase + 4, //uaxxx
|
| - cRangeKorean, //ubxxx
|
| - cRangeKorean, //ucxxx
|
| - cRangeTableBase + 5, //udxxx
|
| - cRangePrivate, //uexxx
|
| - cRangeTableBase + 6 //ufxxx
|
| - },
|
| - {
|
| - //table for 0X--
|
| - cRangeSetLatin, //u00xx
|
| - cRangeSetLatin, //u01xx
|
| - cRangeSetLatin, //u02xx
|
| - cRangeGreek, //u03xx XXX 0300-036f is in fact cRangeCombiningDiacriticalMarks
|
| - cRangeCyrillic, //u04xx
|
| - cRangeTableBase +
|
| - 7, //u05xx, includes Cyrillic supplement, Hebrew, and Armenian
|
| - cRangeArabic, //u06xx
|
| - cRangeTertiaryTable, //u07xx
|
| - cRangeUnassigned, //u08xx
|
| - cRangeTertiaryTable, //u09xx
|
| - cRangeTertiaryTable, //u0axx
|
| - cRangeTertiaryTable, //u0bxx
|
| - cRangeTertiaryTable, //u0cxx
|
| - cRangeTertiaryTable, //u0dxx
|
| - cRangeTertiaryTable, //u0exx
|
| - cRangeTibetan, //u0fxx
|
| - },
|
| - {
|
| - //table for 1x--
|
| - cRangeTertiaryTable, //u10xx
|
| - cRangeKorean, //u11xx
|
| - cRangeEthiopic, //u12xx
|
| - cRangeTertiaryTable, //u13xx
|
| - cRangeCanadian, //u14xx
|
| - cRangeCanadian, //u15xx
|
| - cRangeTertiaryTable, //u16xx
|
| - cRangeKhmer, //u17xx
|
| - cRangeMongolian, //u18xx
|
| - cRangeUnassigned, //u19xx
|
| - cRangeUnassigned, //u1axx
|
| - cRangeUnassigned, //u1bxx
|
| - cRangeUnassigned, //u1cxx
|
| - cRangeUnassigned, //u1dxx
|
| - cRangeSetLatin, //u1exx
|
| - cRangeGreek, //u1fxx
|
| - },
|
| - {
|
| - //table for 2x--
|
| - cRangeSetLatin, //u20xx
|
| - cRangeSetLatin, //u21xx
|
| - cRangeMathOperators, //u22xx
|
| - cRangeMiscTechnical, //u23xx
|
| - cRangeControlOpticalEnclose, //u24xx
|
| - cRangeBoxBlockGeometrics, //u25xx
|
| - cRangeMiscSymbols, //u26xx
|
| - cRangeDingbats, //u27xx
|
| - cRangeBraillePattern, //u28xx
|
| - cRangeUnassigned, //u29xx
|
| - cRangeUnassigned, //u2axx
|
| - cRangeUnassigned, //u2bxx
|
| - cRangeUnassigned, //u2cxx
|
| - cRangeUnassigned, //u2dxx
|
| - cRangeSetCJK, //u2exx
|
| - cRangeSetCJK, //u2fxx
|
| - },
|
| - {
|
| - //table for ax--
|
| - cRangeYi, //ua0xx
|
| - cRangeYi, //ua1xx
|
| - cRangeYi, //ua2xx
|
| - cRangeYi, //ua3xx
|
| - cRangeYi, //ua4xx
|
| - cRangeUnassigned, //ua5xx
|
| - cRangeUnassigned, //ua6xx
|
| - cRangeUnassigned, //ua7xx
|
| - cRangeUnassigned, //ua8xx
|
| - cRangeUnassigned, //ua9xx
|
| - cRangeUnassigned, //uaaxx
|
| - cRangeUnassigned, //uabxx
|
| - cRangeKorean, //uacxx
|
| - cRangeKorean, //uadxx
|
| - cRangeKorean, //uaexx
|
| - cRangeKorean, //uafxx
|
| - },
|
| - {
|
| - //table for dx--
|
| - cRangeKorean, //ud0xx
|
| - cRangeKorean, //ud1xx
|
| - cRangeKorean, //ud2xx
|
| - cRangeKorean, //ud3xx
|
| - cRangeKorean, //ud4xx
|
| - cRangeKorean, //ud5xx
|
| - cRangeKorean, //ud6xx
|
| - cRangeKorean, //ud7xx
|
| - cRangeSurrogate, //ud8xx
|
| - cRangeSurrogate, //ud9xx
|
| - cRangeSurrogate, //udaxx
|
| - cRangeSurrogate, //udbxx
|
| - cRangeSurrogate, //udcxx
|
| - cRangeSurrogate, //uddxx
|
| - cRangeSurrogate, //udexx
|
| - cRangeSurrogate, //udfxx
|
| - },
|
| - {
|
| - // table for fx--
|
| - cRangePrivate, //uf0xx
|
| - cRangePrivate, //uf1xx
|
| - cRangePrivate, //uf2xx
|
| - cRangePrivate, //uf3xx
|
| - cRangePrivate, //uf4xx
|
| - cRangePrivate, //uf5xx
|
| - cRangePrivate, //uf6xx
|
| - cRangePrivate, //uf7xx
|
| - cRangePrivate, //uf8xx
|
| - cRangeSetCJK, //uf9xx
|
| - cRangeSetCJK, //ufaxx
|
| - cRangeArabic, //ufbxx, includes alphabic presentation form
|
| - cRangeArabic, //ufcxx
|
| - cRangeArabic, //ufdxx
|
| - cRangeArabic, //ufexx, includes Combining half marks,
|
| - // CJK compatibility forms,
|
| - // CJK compatibility forms,
|
| - // small form variants
|
| - cRangeTableBase +
|
| - 8, //uffxx, halfwidth and fullwidth forms, includes Specials
|
| - },
|
| - {
|
| - //table for 0x0500 - 0x05ff
|
| - cRangeCyrillic, //u050x
|
| - cRangeCyrillic, //u051x
|
| - cRangeCyrillic, //u052x
|
| - cRangeArmenian, //u053x
|
| - cRangeArmenian, //u054x
|
| - cRangeArmenian, //u055x
|
| - cRangeArmenian, //u056x
|
| - cRangeArmenian, //u057x
|
| - cRangeArmenian, //u058x
|
| - cRangeHebrew, //u059x
|
| - cRangeHebrew, //u05ax
|
| - cRangeHebrew, //u05bx
|
| - cRangeHebrew, //u05cx
|
| - cRangeHebrew, //u05dx
|
| - cRangeHebrew, //u05ex
|
| - cRangeHebrew, //u05fx
|
| - },
|
| - {
|
| - //table for 0xff00 - 0xffff
|
| - cRangeSetCJK, //uff0x, fullwidth latin
|
| - cRangeSetCJK, //uff1x, fullwidth latin
|
| - cRangeSetCJK, //uff2x, fullwidth latin
|
| - cRangeSetCJK, //uff3x, fullwidth latin
|
| - cRangeSetCJK, //uff4x, fullwidth latin
|
| - cRangeSetCJK, //uff5x, fullwidth latin
|
| - cRangeSetCJK, //uff6x, halfwidth katakana
|
| - cRangeSetCJK, //uff7x, halfwidth katakana
|
| - cRangeSetCJK, //uff8x, halfwidth katakana
|
| - cRangeSetCJK, //uff9x, halfwidth katakana
|
| - cRangeSetCJK, //uffax, halfwidth hangul jamo
|
| - cRangeSetCJK, //uffbx, halfwidth hangul jamo
|
| - cRangeSetCJK, //uffcx, halfwidth hangul jamo
|
| - cRangeSetCJK, //uffdx, halfwidth hangul jamo
|
| - cRangeSetCJK, //uffex, fullwidth symbols
|
| - cRangeSpecials, //ufffx, Specials
|
| - },
|
| + {
|
| + // table for X---
|
| + cRangeTableBase + 1, // u0xxx
|
| + cRangeTableBase + 2, // u1xxx
|
| + cRangeTableBase + 3, // u2xxx
|
| + cRangeSetCJK, // u3xxx
|
| + cRangeSetCJK, // u4xxx
|
| + cRangeSetCJK, // u5xxx
|
| + cRangeSetCJK, // u6xxx
|
| + cRangeSetCJK, // u7xxx
|
| + cRangeSetCJK, // u8xxx
|
| + cRangeSetCJK, // u9xxx
|
| + cRangeTableBase + 4, // uaxxx
|
| + cRangeKorean, // ubxxx
|
| + cRangeKorean, // ucxxx
|
| + cRangeTableBase + 5, // udxxx
|
| + cRangePrivate, // uexxx
|
| + cRangeTableBase + 6 // ufxxx
|
| + },
|
| + {
|
| + // table for 0X--
|
| + cRangeSetLatin, // u00xx
|
| + cRangeSetLatin, // u01xx
|
| + cRangeSetLatin, // u02xx
|
| + cRangeGreek, // u03xx XXX 0300-036f is in fact
|
| + // cRangeCombiningDiacriticalMarks
|
| + cRangeCyrillic, // u04xx
|
| + cRangeTableBase +
|
| + 7, // u05xx, includes Cyrillic supplement, Hebrew, and Armenian
|
| + cRangeArabic, // u06xx
|
| + cRangeTertiaryTable, // u07xx
|
| + cRangeUnassigned, // u08xx
|
| + cRangeTertiaryTable, // u09xx
|
| + cRangeTertiaryTable, // u0axx
|
| + cRangeTertiaryTable, // u0bxx
|
| + cRangeTertiaryTable, // u0cxx
|
| + cRangeTertiaryTable, // u0dxx
|
| + cRangeTertiaryTable, // u0exx
|
| + cRangeTibetan, // u0fxx
|
| + },
|
| + {
|
| + // table for 1x--
|
| + cRangeTertiaryTable, // u10xx
|
| + cRangeKorean, // u11xx
|
| + cRangeEthiopic, // u12xx
|
| + cRangeTertiaryTable, // u13xx
|
| + cRangeCanadian, // u14xx
|
| + cRangeCanadian, // u15xx
|
| + cRangeTertiaryTable, // u16xx
|
| + cRangeKhmer, // u17xx
|
| + cRangeMongolian, // u18xx
|
| + cRangeUnassigned, // u19xx
|
| + cRangeUnassigned, // u1axx
|
| + cRangeUnassigned, // u1bxx
|
| + cRangeUnassigned, // u1cxx
|
| + cRangeUnassigned, // u1dxx
|
| + cRangeSetLatin, // u1exx
|
| + cRangeGreek, // u1fxx
|
| + },
|
| + {
|
| + // table for 2x--
|
| + cRangeSetLatin, // u20xx
|
| + cRangeSetLatin, // u21xx
|
| + cRangeMathOperators, // u22xx
|
| + cRangeMiscTechnical, // u23xx
|
| + cRangeControlOpticalEnclose, // u24xx
|
| + cRangeBoxBlockGeometrics, // u25xx
|
| + cRangeMiscSymbols, // u26xx
|
| + cRangeDingbats, // u27xx
|
| + cRangeBraillePattern, // u28xx
|
| + cRangeUnassigned, // u29xx
|
| + cRangeUnassigned, // u2axx
|
| + cRangeUnassigned, // u2bxx
|
| + cRangeUnassigned, // u2cxx
|
| + cRangeUnassigned, // u2dxx
|
| + cRangeSetCJK, // u2exx
|
| + cRangeSetCJK, // u2fxx
|
| + },
|
| + {
|
| + // table for ax--
|
| + cRangeYi, // ua0xx
|
| + cRangeYi, // ua1xx
|
| + cRangeYi, // ua2xx
|
| + cRangeYi, // ua3xx
|
| + cRangeYi, // ua4xx
|
| + cRangeUnassigned, // ua5xx
|
| + cRangeUnassigned, // ua6xx
|
| + cRangeUnassigned, // ua7xx
|
| + cRangeUnassigned, // ua8xx
|
| + cRangeUnassigned, // ua9xx
|
| + cRangeUnassigned, // uaaxx
|
| + cRangeUnassigned, // uabxx
|
| + cRangeKorean, // uacxx
|
| + cRangeKorean, // uadxx
|
| + cRangeKorean, // uaexx
|
| + cRangeKorean, // uafxx
|
| + },
|
| + {
|
| + // table for dx--
|
| + cRangeKorean, // ud0xx
|
| + cRangeKorean, // ud1xx
|
| + cRangeKorean, // ud2xx
|
| + cRangeKorean, // ud3xx
|
| + cRangeKorean, // ud4xx
|
| + cRangeKorean, // ud5xx
|
| + cRangeKorean, // ud6xx
|
| + cRangeKorean, // ud7xx
|
| + cRangeSurrogate, // ud8xx
|
| + cRangeSurrogate, // ud9xx
|
| + cRangeSurrogate, // udaxx
|
| + cRangeSurrogate, // udbxx
|
| + cRangeSurrogate, // udcxx
|
| + cRangeSurrogate, // uddxx
|
| + cRangeSurrogate, // udexx
|
| + cRangeSurrogate, // udfxx
|
| + },
|
| + {
|
| + // table for fx--
|
| + cRangePrivate, // uf0xx
|
| + cRangePrivate, // uf1xx
|
| + cRangePrivate, // uf2xx
|
| + cRangePrivate, // uf3xx
|
| + cRangePrivate, // uf4xx
|
| + cRangePrivate, // uf5xx
|
| + cRangePrivate, // uf6xx
|
| + cRangePrivate, // uf7xx
|
| + cRangePrivate, // uf8xx
|
| + cRangeSetCJK, // uf9xx
|
| + cRangeSetCJK, // ufaxx
|
| + cRangeArabic, // ufbxx, includes alphabic presentation form
|
| + cRangeArabic, // ufcxx
|
| + cRangeArabic, // ufdxx
|
| + cRangeArabic, // ufexx, includes Combining half marks,
|
| + // CJK compatibility forms,
|
| + // CJK compatibility forms,
|
| + // small form variants
|
| + cRangeTableBase +
|
| + 8, // uffxx, halfwidth and fullwidth forms, includes Specials
|
| + },
|
| + {
|
| + // table for 0x0500 - 0x05ff
|
| + cRangeCyrillic, // u050x
|
| + cRangeCyrillic, // u051x
|
| + cRangeCyrillic, // u052x
|
| + cRangeArmenian, // u053x
|
| + cRangeArmenian, // u054x
|
| + cRangeArmenian, // u055x
|
| + cRangeArmenian, // u056x
|
| + cRangeArmenian, // u057x
|
| + cRangeArmenian, // u058x
|
| + cRangeHebrew, // u059x
|
| + cRangeHebrew, // u05ax
|
| + cRangeHebrew, // u05bx
|
| + cRangeHebrew, // u05cx
|
| + cRangeHebrew, // u05dx
|
| + cRangeHebrew, // u05ex
|
| + cRangeHebrew, // u05fx
|
| + },
|
| + {
|
| + // table for 0xff00 - 0xffff
|
| + cRangeSetCJK, // uff0x, fullwidth latin
|
| + cRangeSetCJK, // uff1x, fullwidth latin
|
| + cRangeSetCJK, // uff2x, fullwidth latin
|
| + cRangeSetCJK, // uff3x, fullwidth latin
|
| + cRangeSetCJK, // uff4x, fullwidth latin
|
| + cRangeSetCJK, // uff5x, fullwidth latin
|
| + cRangeSetCJK, // uff6x, halfwidth katakana
|
| + cRangeSetCJK, // uff7x, halfwidth katakana
|
| + cRangeSetCJK, // uff8x, halfwidth katakana
|
| + cRangeSetCJK, // uff9x, halfwidth katakana
|
| + cRangeSetCJK, // uffax, halfwidth hangul jamo
|
| + cRangeSetCJK, // uffbx, halfwidth hangul jamo
|
| + cRangeSetCJK, // uffcx, halfwidth hangul jamo
|
| + cRangeSetCJK, // uffdx, halfwidth hangul jamo
|
| + cRangeSetCJK, // uffex, fullwidth symbols
|
| + cRangeSpecials, // ufffx, Specials
|
| + },
|
| };
|
|
|
| // Most scripts between U+0700 and U+16FF are assigned a chunk of 128 (0x80)
|
| @@ -364,39 +366,39 @@ static const unsigned char gUnicodeSubrangeTable[cNumSubTables][cSubTableSize] =
|
| static const unsigned cTertiaryTableSize = ((0x1700 - 0x0700) / 0x80);
|
|
|
| static const unsigned char gUnicodeTertiaryRangeTable[cTertiaryTableSize] = {
|
| - //table for 0x0700 - 0x1600
|
| - cRangeSyriac, //u070x
|
| - cRangeThaana, //u078x
|
| - cRangeUnassigned, //u080x place holder(resolved in the 2ndary tab.)
|
| - cRangeUnassigned, //u088x place holder(resolved in the 2ndary tab.)
|
| - cRangeDevanagari, //u090x
|
| - cRangeBengali, //u098x
|
| - cRangeGurmukhi, //u0a0x
|
| - cRangeGujarati, //u0a8x
|
| - cRangeOriya, //u0b0x
|
| - cRangeTamil, //u0b8x
|
| - cRangeTelugu, //u0c0x
|
| - cRangeKannada, //u0c8x
|
| - cRangeMalayalam, //u0d0x
|
| - cRangeSinhala, //u0d8x
|
| - cRangeThai, //u0e0x
|
| - cRangeLao, //u0e8x
|
| - cRangeTibetan, //u0f0x place holder(resolved in the 2ndary tab.)
|
| - cRangeTibetan, //u0f8x place holder(resolved in the 2ndary tab.)
|
| - cRangeMyanmar, //u100x
|
| - cRangeGeorgian, //u108x
|
| - cRangeKorean, //u110x place holder(resolved in the 2ndary tab.)
|
| - cRangeKorean, //u118x place holder(resolved in the 2ndary tab.)
|
| - cRangeEthiopic, //u120x place holder(resolved in the 2ndary tab.)
|
| - cRangeEthiopic, //u128x place holder(resolved in the 2ndary tab.)
|
| - cRangeEthiopic, //u130x
|
| - cRangeCherokee, //u138x
|
| - cRangeCanadian, //u140x place holder(resolved in the 2ndary tab.)
|
| - cRangeCanadian, //u148x place holder(resolved in the 2ndary tab.)
|
| - cRangeCanadian, //u150x place holder(resolved in the 2ndary tab.)
|
| - cRangeCanadian, //u158x place holder(resolved in the 2ndary tab.)
|
| - cRangeCanadian, //u160x
|
| - cRangeOghamRunic, //u168x this contains two scripts, Ogham & Runic
|
| + // table for 0x0700 - 0x1600
|
| + cRangeSyriac, // u070x
|
| + cRangeThaana, // u078x
|
| + cRangeUnassigned, // u080x place holder(resolved in the 2ndary tab.)
|
| + cRangeUnassigned, // u088x place holder(resolved in the 2ndary tab.)
|
| + cRangeDevanagari, // u090x
|
| + cRangeBengali, // u098x
|
| + cRangeGurmukhi, // u0a0x
|
| + cRangeGujarati, // u0a8x
|
| + cRangeOriya, // u0b0x
|
| + cRangeTamil, // u0b8x
|
| + cRangeTelugu, // u0c0x
|
| + cRangeKannada, // u0c8x
|
| + cRangeMalayalam, // u0d0x
|
| + cRangeSinhala, // u0d8x
|
| + cRangeThai, // u0e0x
|
| + cRangeLao, // u0e8x
|
| + cRangeTibetan, // u0f0x place holder(resolved in the 2ndary tab.)
|
| + cRangeTibetan, // u0f8x place holder(resolved in the 2ndary tab.)
|
| + cRangeMyanmar, // u100x
|
| + cRangeGeorgian, // u108x
|
| + cRangeKorean, // u110x place holder(resolved in the 2ndary tab.)
|
| + cRangeKorean, // u118x place holder(resolved in the 2ndary tab.)
|
| + cRangeEthiopic, // u120x place holder(resolved in the 2ndary tab.)
|
| + cRangeEthiopic, // u128x place holder(resolved in the 2ndary tab.)
|
| + cRangeEthiopic, // u130x
|
| + cRangeCherokee, // u138x
|
| + cRangeCanadian, // u140x place holder(resolved in the 2ndary tab.)
|
| + cRangeCanadian, // u148x place holder(resolved in the 2ndary tab.)
|
| + cRangeCanadian, // u150x place holder(resolved in the 2ndary tab.)
|
| + cRangeCanadian, // u158x place holder(resolved in the 2ndary tab.)
|
| + cRangeCanadian, // u160x
|
| + cRangeOghamRunic, // u168x this contains two scripts, Ogham & Runic
|
| };
|
|
|
| // A two level index is almost enough for locating a range, with the
|
| @@ -413,7 +415,7 @@ unsigned findCharUnicodeRange(UChar32 ch) {
|
|
|
| unsigned range;
|
|
|
| - //search the first table
|
| + // search the first table
|
| range = gUnicodeSubrangeTable[0][ch >> 12];
|
|
|
| if (range < cRangeTableBase)
|
|
|
Chromium Code Reviews
Issue 2385283002:
reflow comments in platform/{testing,text} (Closed)
