Account for total glyph overflow in CachingWordShaper::width

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 "config.h"
 #include "platform/fonts/shaping/CachingWordShaper.h"
 
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/GlyphBuffer.h"
 #include "platform/fonts/shaping/CachingWordShapeIterator.h"
@@ skipping 185 matching lines @@
     verticalMixedFont.update(nullptr);
     ASSERT_TRUE(verticalMixedFont.canShapeWordByWord());
 
     CachingWordShaper shaper(cache.get());
     FloatRect glyphBounds;
     HashSet<const SimpleFontData*> fallbackFonts;
     ASSERT_GT(shaper.width(&verticalMixedFont, textRun, &fallbackFonts, &glyphBounds), 0);
     EXPECT_EQ(0u, fallbackFonts.size());
 }
 
+TEST_F(CachingWordShaperTest, GlyphBoundsWithSpaces)
+{
+    CachingWordShaper shaper(cache.get());
+
+    TextRun periods(reinterpret_cast<const LChar*>(".........."), 10);
+    FloatRect periodsGlyphBounds;
+    float periodsWidth = shaper.width(&font, periods, nullptr, &periodsGlyphBounds);
+
+    TextRun periodsAndSpaces(reinterpret_cast<const LChar*>(". . . . . . . . . ."), 19);
+    FloatRect periodsAndSpacesGlyphBounds;
+    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