Re-evaluate ShapeResult::m_hasVerticalOffsets after applying spacing

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

 /*
  * Copyright (c) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 BlackBerry Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 223 matching lines @@
 
             // Skip if it's not a grapheme cluster boundary.
             if (i + 1 < run->m_glyphData.size()
                 && glyphData.characterIndex == run->m_glyphData[i + 1].characterIndex) {
                 // In RTL, marks need the same letter-spacing offset as the base.
                 if (textRun.rtl() && spacing.letterSpacing()) {
                     offsetX = offsetY = 0;
                     offset = spacing.letterSpacing();
                     glyphData.offset.expand(offsetX, offsetY);
                 }
-                continue;
+            } else {
+                offsetX = offsetY = 0;
+                float space = spacing.computeSpacing(textRun,
+                    run->m_startIndex + glyphData.characterIndex, offset);
+                glyphData.advance += space;
+                totalSpaceForRun += space;
+                if (textRun.rtl()) {
+                    // In RTL, spacing should be added to left side of glyphs.
+                    offset += space;
+                }
+                glyphData.offset.expand(offsetX, offsetY);
             }
-
-            offsetX = offsetY = 0;
-            float space = spacing.computeSpacing(textRun,
-                run->m_startIndex + glyphData.characterIndex, offset);
-            glyphData.advance += space;
-            totalSpaceForRun += space;
-            if (textRun.rtl()) {
-                // In RTL, spacing should be added to left side of glyphs.
-                offset += space;
-            }
-            glyphData.offset.expand(offsetX, offsetY);
+            m_hasVerticalOffsets |= (glyphData.offset.height() != 0);
         }
         run->m_width += totalSpaceForRun;
         totalSpace += totalSpaceForRun;
     }
     m_width += totalSpace;
     if (spacing.isVerticalOffset())
         m_glyphBoundingBox.setHeight(m_glyphBoundingBox.height() + totalSpace);
     else
         m_glyphBoundingBox.setWidth(m_glyphBoundingBox.width() + totalSpace);
 }
@@ skipping 81 matching lines @@
                 break;
             }
         }
     }
     // If we didn't find an existing slot to place it, append.
     if (run)
         m_runs.append(run.release());
 }
 
 } // namespace blink