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

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/fonts/Character.h"
 
 #include "platform/Logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/text/CharacterNames.h"
 
@@ skipping 125 matching lines @@
     static UChar c4[] = { 0x36F, 0x330 };
     EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c4, 2));
     // Surrogate-Complex is Complex
     static UChar c5[] = { 0xD83C, 0xDDE5, 0x330 };
     EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c5, 3));
     // Complex-Surrogate is Complex
     static UChar c6[] = { 0x330, 0xD83C, 0xDDE5 };
     EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c6, 3));
 }
 
-static void TestSpecificUChar32RangeIdeograph(UChar32 rangeStart,
-    UChar32 rangeEnd,
-    bool before = true)
+static void TestSpecificUChar32RangeIdeograph(UChar32 rangeStart, UChar32 rangeEnd)
 {
-    if (before)
-        EXPECT_FALSE(Character::isCJKIdeographOrSymbol(rangeStart - 1));
-    EXPECT_TRUE(Character::isCJKIdeographOrSymbol(rangeStart));
-    EXPECT_TRUE(Character::isCJKIdeographOrSymbol(
-        (UChar32)((uint64_t)rangeStart + (uint64_t)rangeEnd) / 2));
-    EXPECT_TRUE(Character::isCJKIdeographOrSymbol(rangeEnd));
-    EXPECT_FALSE(Character::isCJKIdeographOrSymbol(rangeEnd + 1));
+    EXPECT_FALSE(Character::isCJKIdeograph(rangeStart - 1));
+    EXPECT_TRUE(Character::isCJKIdeograph(rangeStart));
+    EXPECT_TRUE(Character::isCJKIdeograph((UChar32)((uint64_t)rangeStart + (uint64_t)rangeEnd) / 2));
+    EXPECT_TRUE(Character::isCJKIdeograph(rangeEnd));
+    EXPECT_FALSE(Character::isCJKIdeograph(rangeEnd + 1));
 }
 
 TEST(CharacterTest, TestIsCJKIdeograph)
 {
     // The basic CJK Unified Ideographs block.
     TestSpecificUChar32RangeIdeograph(0x4E00, 0x9FFF);
     // CJK Unified Ideographs Extension A.
-    TestSpecificUChar32RangeIdeograph(0x3400, 0x4DBF, false);
+    TestSpecificUChar32RangeIdeograph(0x3400, 0x4DBF);
     // CJK Unified Ideographs Extension A and Kangxi Radicals.
     TestSpecificUChar32RangeIdeograph(0x2E80, 0x2FDF);
     // CJK Strokes.
-    TestSpecificUChar32RangeIdeograph(0x31C0, 0x31EF, false);
+    TestSpecificUChar32RangeIdeograph(0x31C0, 0x31EF);
     // CJK Compatibility Ideographs.
     TestSpecificUChar32RangeIdeograph(0xF900, 0xFAFF);
     // CJK Unified Ideographs Extension B.
     TestSpecificUChar32RangeIdeograph(0x20000, 0x2A6DF);
     // CJK Unified Ideographs Extension C.
     // CJK Unified Ideographs Extension D.
     TestSpecificUChar32RangeIdeograph(0x2A700, 0x2B81F);
     // CJK Compatibility Ideographs Supplement.
     TestSpecificUChar32RangeIdeograph(0x2F800, 0x2FA1F);
 }
@@ skipping 187 matching lines @@
     EXPECT_FALSE(Character::isEmojiModifierBase(0x1F47D));
 }
 
 TEST(CharacterTest, LineBreakAndQuoteNotEmoji)
 {
     EXPECT_FALSE(Character::isEmojiTextPresentation('\n'));
     EXPECT_FALSE(Character::isEmojiTextPresentation('"'));
 }
 
 } // namespace blink