Account for total glyph overflow in CachingWordShaper::width

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

 /*
  * Copyright (C) 2015 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 25 matching lines @@
 
 float CachingWordShaper::width(const Font* font, const TextRun& run,
     HashSet<const SimpleFontData*>* fallbackFonts,
     FloatRect* glyphBounds)
 {
     float width = 0;
     RefPtr<ShapeResult> wordResult;
     CachingWordShapeIterator iterator(m_shapeCache, run, font);
     while (iterator.next(&wordResult)) {
         if (wordResult) {
+            if (glyphBounds) {
+                FloatRect adjustedBounds = wordResult->bounds();
+                // Translate glyph bounds to the current glyph position which
+                // is the total width before this glyph.
+                adjustedBounds.setX(adjustedBounds.x() + width);
+                glyphBounds->unite(adjustedBounds);
+            }
             width += wordResult->width();
-            if (glyphBounds)
-                glyphBounds->unite(wordResult->bounds());
             if (fallbackFonts)
                 wordResult->fallbackFonts(fallbackFonts);
         }
     }
 
     return width;
 }
 
 static inline float shapeResultsForRun(ShapeCache* shapeCache, const Font* font,
     const TextRun& run, HashSet<const SimpleFontData*>* fallbackFonts,
@@ skipping 47 matching lines @@
 {
     Vector<RefPtr<ShapeResult>> results;
     float totalWidth = shapeResultsForRun(m_shapeCache, font, run, nullptr,
         &results);
 
     return ShapeResult::selectionRect(results, run.direction(), totalWidth,
         point, height, from, to);
 }
 
 }; // namespace blink