Segment strings on dot and comma in addition to space and tab

third_party/WebKit/Source/platform/fonts/shaping/CachingWordShaperTest.cpp

 // Copyright (c) 2014 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/shaping/CachingWordShaper.h"
 
 #include "platform/fonts/CharacterRange.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/GlyphBuffer.h"
 #include "platform/fonts/shaping/CachingWordShapeIterator.h"
@@ skipping 47 matching lines @@
 
     ASSERT_TRUE(iterator.next(&result));
     ASSERT_TRUE(testInfo(result)->runInfoForTesting(0, startIndex, numGlyphs, script));
     EXPECT_EQ(0u, startIndex);
     EXPECT_EQ(1u, numGlyphs);
     EXPECT_EQ(HB_SCRIPT_COMMON, script);
 
     ASSERT_TRUE(iterator.next(&result));
     ASSERT_TRUE(testInfo(result)->runInfoForTesting(0, startIndex, numGlyphs, script));
     EXPECT_EQ(0u, startIndex);
-    EXPECT_EQ(4u, numGlyphs);
+    EXPECT_EQ(3u, numGlyphs);
     EXPECT_EQ(HB_SCRIPT_LATIN, script);
 
+    ASSERT_TRUE(iterator.next(&result));
+    ASSERT_TRUE(testInfo(result)->runInfoForTesting(0, startIndex, numGlyphs, script));
+    EXPECT_EQ(0u, startIndex);
+    EXPECT_EQ(1u, numGlyphs);
+    EXPECT_EQ(HB_SCRIPT_COMMON, script);
+
     ASSERT_FALSE(iterator.next(&result));
 }
 
 TEST_F(CachingWordShaperTest, CommonAccentLeftToRightByWord)
 {
     const UChar str[] = { 0x2F, 0x301, 0x2E, 0x20, 0x2E, 0x0 };
     TextRun textRun(str, 5);
 
     unsigned offset = 0;
     RefPtr<ShapeResult> result;
     CachingWordShapeIterator iterator(cache.get(), textRun, &font);
     ASSERT_TRUE(iterator.next(&result));
     ASSERT_TRUE(testInfo(result)->runInfoForTesting(0, startIndex, numGlyphs, script));
     EXPECT_EQ(0u, offset + startIndex);
-    EXPECT_EQ(3u, numGlyphs);
+    EXPECT_EQ(2u, numGlyphs);
     EXPECT_EQ(HB_SCRIPT_COMMON, script);
     offset += result->numCharacters();
 
+    ASSERT_TRUE(iterator.next(&result));
+    ASSERT_TRUE(testInfo(result)->runInfoForTesting(0, startIndex, numGlyphs, script));
+    EXPECT_EQ(2u, offset + startIndex);
+    EXPECT_EQ(1u, numGlyphs);
+    EXPECT_EQ(HB_SCRIPT_COMMON, script);
+    offset += result->numCharacters();
+
     ASSERT_TRUE(iterator.next(&result));
     ASSERT_TRUE(testInfo(result)->runInfoForTesting(0, startIndex, numGlyphs, script));
     EXPECT_EQ(3u, offset + startIndex);
     EXPECT_EQ(1u, numGlyphs);
     EXPECT_EQ(HB_SCRIPT_COMMON, script);
     offset += result->numCharacters();
 
     ASSERT_TRUE(iterator.next(&result));
     ASSERT_TRUE(testInfo(result)->runInfoForTesting(0, startIndex, numGlyphs, script));
     EXPECT_EQ(4u, offset + startIndex);
@@ skipping 418 matching lines @@
     float periodsAndSpacesWidth = shaper.width(&font, periodsAndSpaces, nullptr, &periodsAndSpacesGlyphBounds);
 
     // The total width of periods and spaces should be longer than the width of periods alone.
     ASSERT_GT(periodsAndSpacesWidth, periodsWidth);
 
     // The glyph bounds of periods and spaces should be longer than the glyph bounds of periods alone.
     ASSERT_GT(periodsAndSpacesGlyphBounds.width(), periodsGlyphBounds.width());
 }
 
 } // namespace blink