Revert of Improve performance of Character::isCJKIdeographOrSymbol by using trie tree

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

 /*
  * 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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef Character_h
 #define Character_h
 
 #include "platform/PlatformExport.h"
-#include "platform/fonts/CharacterProperty.h"
 #include "platform/text/TextDirection.h"
 #include "platform/text/TextPath.h"
 #include "platform/text/TextRun.h"
 #include "wtf/Allocator.h"
 #include "wtf/HashSet.h"
 #include "wtf/text/CharacterNames.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class PLATFORM_EXPORT Character {
     STATIC_ONLY(Character);
 public:
     static CodePath characterRangeCodePath(const LChar*, unsigned) { return SimplePath; }
     static CodePath characterRangeCodePath(const UChar*, unsigned len);
 
     static inline bool isInRange(UChar32 character, UChar32 lowerBound, UChar32 upperBound)
     {
         return character >= lowerBound && character <= upperBound;
     }
 
     static inline bool isUnicodeVariationSelector(UChar32 character)
     {
         // http://www.unicode.org/Public/UCD/latest/ucd/StandardizedVariants.html
         return isInRange(character, 0x180B, 0x180D) // MONGOLIAN FREE VARIATION SELECTOR ONE to THREE
             || isInRange(character, 0xFE00, 0xFE0F) // VARIATION SELECTOR-1 to 16
             || isInRange(character, 0xE0100, 0xE01EF); // VARIATION SELECTOR-17 to 256
     }
 
+    static bool isCJKIdeograph(UChar32);
     static bool isCJKIdeographOrSymbol(UChar32);
 
     static unsigned expansionOpportunityCount(const LChar*, size_t length, TextDirection, bool& isAfterExpansion, const TextJustify);
     static unsigned expansionOpportunityCount(const UChar*, size_t length, TextDirection, bool& isAfterExpansion, const TextJustify);
 
     static bool isUprightInMixedVertical(UChar32 character);
 
     static bool treatAsSpace(UChar c)
     {
         return c == spaceCharacter
@@ skipping 50 matching lines @@
         // This function returns true for 0x000B also, so that this is backward compatible.
         // Otherwise, the test LayoutTests/canvas/philip/tests/2d.text.draw.space.collapse.space.html will fail
         return c == 0x0009 || (c >= 0x000A && c <= 0x000D);
     }
 
     static String normalizeSpaces(const LChar*, unsigned length);
     static String normalizeSpaces(const UChar*, unsigned length);
 
     static bool isCommonOrInheritedScript(UChar32);
 
-private:
-    static bool hasProperty(UChar32, CharacterProperty);
 };
 
 } // namespace blink
 
 #endif