Make Character::isCJKIdeographOrSymbol() faster for common characters

third_party/WebKit/Source/platform/fonts/Character.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 324 matching lines @@
 
     return valueInIntervalList(cjkIdeographRanges, c);
 }
 
 bool Character::isCJKIdeographOrSymbol(UChar32 c)
 {
     // Likely common case
     if (c < 0x2C7)
         return false;
 
-    // Hash lookup for isolated symbols (those not part of a contiguous range)
-    static HashSet<UChar32>* cjkIsolatedSymbols = 0;
-    if (!cjkIsolatedSymbols) {
-        cjkIsolatedSymbols = new HashSet<UChar32>();
-        for (size_t i = 0; i < WTF_ARRAY_LENGTH(cjkIsolatedSymbolsArray); ++i)
-            cjkIsolatedSymbols->add(cjkIsolatedSymbolsArray[i]);
-    }
-    if (cjkIsolatedSymbols->contains(c))
-        return true;
-
     if (isCJKIdeograph(c))
         return true;
 
     static const UChar32 cjkSymbolRanges[] = {
         0x2156, 0x215A,
         0x2160, 0x216B,
         0x2170, 0x217B,
         0x23BE, 0x23CC,
         0x2460, 0x2492,
         0x249C, 0x24FF,
@@ skipping 21 matching lines @@
         0xFF0E, 0xFF1A,
         0xFF1F, 0xFFEF,
         // Emoji.
         0x1F110, 0x1F129,
         0x1F130, 0x1F149,
         0x1F150, 0x1F169,
         0x1F170, 0x1F189,
         0x1F200, 0x1F6FF
     };
 
-    return valueInIntervalList(cjkSymbolRanges, c);
+    if (c >= cjkSymbolRanges[0]
+        && c <= cjkSymbolRanges[WTF_ARRAY_LENGTH(cjkSymbolRanges) - 1]
+        && valueInIntervalList(cjkSymbolRanges, c)) {
+        return true;
+    }
+
+    if (c < 0x2020 && c > 0x2D9)
+        return false;
+
+    // Hash lookup for isolated symbols (those not part of a contiguous range)
+    static HashSet<UChar32>* cjkIsolatedSymbols = 0;
+    if (!cjkIsolatedSymbols) {
+        cjkIsolatedSymbols = new HashSet<UChar32>();
+        for (size_t i = 0; i < WTF_ARRAY_LENGTH(cjkIsolatedSymbolsArray); ++i)
+            cjkIsolatedSymbols->add(cjkIsolatedSymbolsArray[i]);
+    }
+    return cjkIsolatedSymbols->contains(c);
 }
 
 unsigned Character::expansionOpportunityCount(const LChar* characters, size_t length, TextDirection direction, bool& isAfterExpansion, const TextJustify textJustify)
 {
     unsigned count = 0;
     if (textJustify == TextJustifyDistribute) {
         isAfterExpansion = true;
         return length;
     }
 
@@ skipping 106 matching lines @@
 }
 
 bool Character::isCommonOrInheritedScript(UChar32 character)
 {
     UErrorCode status = U_ZERO_ERROR;
     UScriptCode script = uscript_getScript(character, &status);
     return U_SUCCESS(status) && (script == USCRIPT_COMMON || script == USCRIPT_INHERITED);
 }
 
 } // namespace blink