Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(717)

Unified Diff: third_party/WebKit/Source/platform/text/CharacterTest.cpp

Issue 1479003002: Remove Simple Text Path (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/text/CharacterTest.cpp
diff --git a/third_party/WebKit/Source/platform/text/CharacterTest.cpp b/third_party/WebKit/Source/platform/text/CharacterTest.cpp
index 087998104f5a57639c94950637a6af74cb758816..121a2c28bcd57e0fbff19f4a65304a9525d84603 100644
--- a/third_party/WebKit/Source/platform/text/CharacterTest.cpp
+++ b/third_party/WebKit/Source/platform/text/CharacterTest.cpp
@@ -9,70 +9,6 @@
namespace blink {
-static void TestSpecificUCharRange(UChar rangeStart, UChar rangeEnd) {
- UChar below[1];
- UChar start[1];
- UChar midway[1];
- UChar end[1];
- UChar above[1];
-
- below[0] = rangeStart - 1;
- start[0] = rangeStart;
- midway[0] = ((int)rangeStart + (int)rangeEnd) / 2;
- end[0] = rangeEnd;
- above[0] = rangeEnd + 1;
-
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(below, 1));
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(start, 1));
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(midway, 1));
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(end, 1));
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(above, 1));
-}
-
-TEST(CharacterTest, TestCharacterRangeCodePath) {
- static UChar c1[] = {0x0};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c1, 1));
-
- TestSpecificUCharRange(0x2E5, 0x2E9);
- TestSpecificUCharRange(0x300, 0x36F);
- TestSpecificUCharRange(0x0591, 0x05BD);
- TestSpecificUCharRange(0x05BF, 0x05CF);
- TestSpecificUCharRange(0x0600, 0x109F);
- TestSpecificUCharRange(0x1100, 0x11FF);
- TestSpecificUCharRange(0x135D, 0x135F);
- TestSpecificUCharRange(0x1700, 0x18AF);
- TestSpecificUCharRange(0x1900, 0x194F);
- TestSpecificUCharRange(0x1980, 0x19DF);
- TestSpecificUCharRange(0x1A00, 0x1CFF);
-
- static UChar c2[] = {0x1DBF};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c2, 1));
- static UChar c3[] = {0x1DC0};
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c3, 1));
- static UChar c4[] = {0x1DD0};
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c4, 1));
- static UChar c5[] = {0x1DFF};
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c5, 1));
- static UChar c6[] = {0x1E00};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c6, 1));
- static UChar c7[] = {0x2000};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c7, 1));
- static UChar c8[] = {0x2001};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c8, 1));
-
- TestSpecificUCharRange(0x20D0, 0x20FF);
- TestSpecificUCharRange(0x2CEF, 0x2CF1);
- TestSpecificUCharRange(0x302A, 0x302F);
-
- TestSpecificUCharRange(0xA67C, 0xA67D);
- TestSpecificUCharRange(0xA6F0, 0xA6F1);
- TestSpecificUCharRange(0xA800, 0xABFF);
-
- TestSpecificUCharRange(0xD7B0, 0xD7FF);
- TestSpecificUCharRange(0xFE00, 0xFE0F);
- TestSpecificUCharRange(0xFE20, 0xFE2F);
-}
-
testing::AssertionResult isCJKIdeographOrSymbolWithMessage(UChar32 codepoint) {
const size_t formatBufferSize = 10;
char formattedAsHex[formatBufferSize];
@@ -95,85 +31,6 @@ TEST(CharacterTest, HammerEmojiVsCJKIdeographOrSymbol) {
}
}
-TEST(CharacterTest, TestCharacterRangeCodePathSurrogate1) {
- /* To be surrogate ... */
- /* 1st character must be 0xD800 .. 0xDBFF */
- /* 2nd character must be 0xdc00 .. 0xdfff */
-
- /* The following 5 should all be Simple because they are not surrogate. */
- static UChar c1[] = {0xD800, 0xDBFE};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c1, 2));
- static UChar c2[] = {0xD800, 0xE000};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c2, 2));
- static UChar c3[] = {0xDBFF, 0xDBFE};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c3, 2));
- static UChar c4[] = {0xDBFF, 0xE000};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c4, 2));
- static UChar c5[] = {0xDC00, 0xDBFF};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c5, 2));
-
- /* To be Complex, the Supplementary Character must be in either */
- /* U+1F1E6 through U+1F1FF or U+E0100 through U+E01EF. */
- /* That is, a lead of 0xD83C with trail 0xDDE6 .. 0xDDFF or */
- /* a lead of 0xDB40 with trail 0xDD00 .. 0xDDEF. */
- static UChar c6[] = {0xD83C, 0xDDE5};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c6, 2));
- static UChar c7[] = {0xD83C, 0xDDE6};
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c7, 2));
- static UChar c8[] = {0xD83C, 0xDDF0};
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c8, 2));
- static UChar c9[] = {0xD83C, 0xDDFF};
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c9, 2));
- static UChar c10[] = {0xD83C, 0xDE00};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c10, 2));
-
- static UChar c11[] = {0xDB40, 0xDCFF};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c11, 2));
- static UChar c12[] = {0xDB40, 0xDD00};
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c12, 2));
- static UChar c13[] = {0xDB40, 0xDDED};
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c13, 2));
- static UChar c14[] = {0xDB40, 0xDDEF};
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c14, 2));
- static UChar c15[] = {0xDB40, 0xDDF0};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c15, 2));
-
- // Eye + Speech Bubble
- static UChar c16[] = {0xD83D, 0xDC40};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c16, 2));
- static UChar c17[] = {0xD83D, 0xDC41};
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c17, 2));
- static UChar c18[] = {0xD83D, 0xDC42};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c18, 2));
- static UChar c19[] = {0xD83D, 0xDDE7};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c19, 2));
- static UChar c20[] = {0xD83D, 0xDDE8};
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c20, 2));
- static UChar c21[] = {0xD83D, 0xDDE9};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c21, 2));
-}
-
-TEST(CharacterTest, TestCharacterRangeCodePathString) {
- // Simple-Simple is still simple
- static UChar c1[] = {0x2FF, 0x2FF};
- EXPECT_EQ(SimplePath, Character::characterRangeCodePath(c1, 2));
- // Complex-Simple is Complex
- static UChar c2[] = {0x300, 0x2FF};
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c2, 2));
- // Simple-Complex is Complex
- static UChar c3[] = {0x2FF, 0x330};
- EXPECT_EQ(ComplexPath, Character::characterRangeCodePath(c3, 2));
- // Complex-Complex is Complex
- 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) {
« no previous file with comments | « third_party/WebKit/Source/platform/text/Character.cpp ('k') | third_party/WebKit/Source/platform/text/TextPath.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698