Replace ENABLE_OPENTYPE_VERTICAL implementation with HarfBuzz

Source/platform/fonts/harfbuzz/FontHarfBuzz.cpp

 /*
  * Copyright (c) 2007, 2008, 2010 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 108 matching lines @@
 }
 
 void Font::drawGlyphs(GraphicsContext* gc, const SimpleFontData* font,
     const GlyphBuffer& glyphBuffer, unsigned from, unsigned numGlyphs,
     const FloatPoint& point, const FloatRect& textRect) const
 {
     SkScalar x = SkFloatToScalar(point.x());
     SkScalar y = SkFloatToScalar(point.y());
 
     const OpenTypeVerticalData* verticalData = font->verticalData();
-    if (font->platformData().orientation() == Vertical && verticalData) {
-        SkAutoSTMalloc<32, SkPoint> storage(numGlyphs);
-        SkPoint* pos = storage.get();
+    bool drawVertically = font->platformData().orientation() == Vertical && verticalData;
 
-        AffineTransform savedMatrix = gc->getCTM();
+    AffineTransform savedMatrix = gc->getCTM();
+    if (drawVertically) {

[eae, 2014/10/01 15:39:50]

Could you move this down to line 150 so that it is before the no-offset
implementation?

         gc->concatCTM(AffineTransform(0, -1, 1, 0, point.x(), point.y()));
         gc->concatCTM(AffineTransform(1, 0, 0, 1, -point.x(), -point.y()));
-
-        const unsigned kMaxBufferLength = 256;
-        Vector<FloatPoint, kMaxBufferLength> translations;
-
-        const FontMetrics& metrics = font->fontMetrics();
-        SkScalar verticalOriginX = SkFloatToScalar(point.x() + metrics.floatAscent() - metrics.floatAscent(IdeographicBaseline));
-        float horizontalOffset = point.x();
-
-        unsigned glyphIndex = 0;
-        while (glyphIndex < numGlyphs) {
-            unsigned chunkLength = std::min(kMaxBufferLength, numGlyphs - glyphIndex);
-
-            const Glyph* glyphs = glyphBuffer.glyphs(from + glyphIndex);
-            translations.resize(chunkLength);
-            verticalData->getVerticalTranslationsForGlyphs(font, &glyphs[0], chunkLength, reinterpret_cast<float*>(&translations[0]));
-
-            x = verticalOriginX;
-            y = SkFloatToScalar(point.y() + horizontalOffset - point.x());
-
-            float currentWidth = 0;
-            for (unsigned i = 0; i < chunkLength; ++i, ++glyphIndex) {
-                pos[i].set(
-                    x + SkIntToScalar(lroundf(translations[i].x())),
-                    y + -SkIntToScalar(-lroundf(currentWidth - translations[i].y())));
-                currentWidth += glyphBuffer.advanceAt(from + glyphIndex);
-            }
-            horizontalOffset += currentWidth;
-            paintGlyphs(gc, font, glyphs, chunkLength, pos, textRect);
-        }
-
-        gc->setCTM(savedMatrix);
-        return;
     }
 
     if (!glyphBuffer.hasOffsets()) {
+        ASSERT(!drawVertically);
         SkAutoSTMalloc<64, SkScalar> storage(numGlyphs);
         SkScalar* xpos = storage.get();
         const float* adv = glyphBuffer.advances(from);
         for (unsigned i = 0; i < numGlyphs; i++) {
             xpos[i] = x;
             x += SkFloatToScalar(adv[i]);
         }
         const Glyph* glyphs = glyphBuffer.glyphs(from);
         paintGlyphsHorizontal(gc, font, glyphs, numGlyphs, xpos, SkFloatToScalar(y), textRect);
         return;
     }
 
     ASSERT(glyphBuffer.hasOffsets());
     const GlyphBufferWithOffsets& glyphBufferWithOffsets =
         static_cast<const GlyphBufferWithOffsets&>(glyphBuffer);
     SkAutoSTMalloc<32, SkPoint> storage(numGlyphs);
     SkPoint* pos = storage.get();
     const FloatSize* offsets = glyphBufferWithOffsets.offsets(from);
     const float* advances = glyphBufferWithOffsets.advances(from);
     SkScalar advanceSoFar = SkFloatToScalar(0);
-    for (unsigned i = 0; i < numGlyphs; i++) {
-        pos[i].set(
-            x + SkFloatToScalar(offsets[i].width()) + advanceSoFar,
-            y + SkFloatToScalar(offsets[i].height()));
-        advanceSoFar += SkFloatToScalar(advances[i]);
+    if (drawVertically) {
+        const FontMetrics& metrics = font->fontMetrics();
+        x += SkFloatToScalar(metrics.floatAscent() - metrics.floatAscent(IdeographicBaseline));
+        for (unsigned i = 0; i < numGlyphs; i++) {
+            pos[i].set(
+                x + SkFloatToScalar(offsets[i].width()),
+                y + SkFloatToScalar(offsets[i].height()) + advanceSoFar);
+            advanceSoFar += SkFloatToScalar(advances[i]);
+        }
+    } else {
+        for (unsigned i = 0; i < numGlyphs; i++) {
+            pos[i].set(
+                x + SkFloatToScalar(offsets[i].width()) + advanceSoFar,
+                y + SkFloatToScalar(offsets[i].height()));
+            advanceSoFar += SkFloatToScalar(advances[i]);
+        }
     }
 
     const Glyph* glyphs = glyphBufferWithOffsets.glyphs(from);
     paintGlyphs(gc, font, glyphs, numGlyphs, pos, textRect);
+
+    if (drawVertically) {
+        gc->setCTM(savedMatrix);
+    }
 }
 
 void Font::drawTextBlob(GraphicsContext* gc, const SkTextBlob* blob, const SkPoint& origin) const
 {
     ASSERT(RuntimeEnabledFeatures::textBlobEnabled());
 
     // FIXME: It would be good to move this to Font.cpp, if we're sure that none
     // of the things in FontMac's setupPaint need to apply here.
     // See also paintGlyphs.
     TextDrawingModeFlags textMode = gc->textDrawingMode();
@@ skipping 134 matching lines @@
             buffer.pos[j] = x;
             x += SkFloatToScalar(advances[j]);
         }
     }
 
     advance = x;
     return adoptRef(builder.build());
 }
 
 } // namespace blink