Merge HarfBuzz kerning support from Blink

ui/gfx/render_text_harfbuzz.cc

 // Copyright 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 "ui/gfx/render_text_harfbuzz.h"
 
 #include <map>
 
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/char_iterator.h"
@@ skipping 108 matching lines @@
 hb_bool_t GetGlyphHorizontalOrigin(hb_font_t* font,
                                    void* data,
                                    hb_codepoint_t glyph,
                                    hb_position_t* x,
                                    hb_position_t* y,
                                    void* user_data) {
   // Just return true, like the HarfBuzz-FreeType implementation.
   return true;
 }
 
+hb_position_t GetGlyphHorizontalKerning(hb_font_t*,

[msw, 2014/05/27 22:00:59]

nit: give names to even unused parameters (this and last void*).

[ckocagil, 2014/05/28 01:07:10]

Done.

+                                        void* data,
+                                        hb_codepoint_t left_glyph,
+                                        hb_codepoint_t right_glyph,
+                                        void*) {
+  FontData* font_data = reinterpret_cast<FontData*>(data);
+  if (font_data->paint_.isVerticalText()) {
+    // We don't support cross-stream kerning.
+    return 0;
+  }
+
+  SkTypeface* typeface = font_data->paint_.getTypeface();
+  const uint16_t glyphs[2] = { left_glyph, right_glyph };
+  int32_t kerningAdjustments[1] = { 0 };

[msw, 2014/05/27 22:00:59]

nit: |kerning_adjustments|

[ckocagil, 2014/05/28 01:07:10]

Done.

+
+  if (typeface->getKerningPairAdjustments(glyphs, 2, kerningAdjustments)) {
+    SkScalar upm = SkIntToScalar(typeface->getUnitsPerEm());
+    SkScalar size = font_data->paint_.getTextSize();
+    return SkiaScalarToHarfBuzzPosition(
+        SkScalarMulDiv(SkIntToScalar(kerningAdjustments[0]), size, upm));
+  }
+
+  return 0;
+}
+
+hb_position_t GetGlyphVerticalKerning(hb_font_t*,
+                                      void* data,
+                                      hb_codepoint_t top_glyph,
+                                      hb_codepoint_t bottom_glyph,
+                                      void*) {
+  FontData* font_data = reinterpret_cast<FontData*>(data);
+  if (!font_data->paint_.isVerticalText()) {

[msw, 2014/05/27 22:00:59]

This is the only logical difference from the function above. I understand that
parity with Blink is valuable, but perhaps we could have both of our functions
call a common helper? (Blink could do the same, but that's not in scope)

[ckocagil, 2014/05/28 01:07:10]

Done, added a common helper.

+    // We don't support cross-stream kerning.
+    return 0;
+  }
+
+  SkTypeface* typeface = font_data->paint_.getTypeface();
+  const uint16_t glyphs[2] = { top_glyph, bottom_glyph };
+  int32_t kerningAdjustments[1] = { 0 };

[msw, 2014/05/27 22:00:59]

ditto nit: |kerning_adjustments|

[ckocagil, 2014/05/28 01:07:10]

Done.

+
+  if (typeface->getKerningPairAdjustments(glyphs, 2, kerningAdjustments)) {
+    SkScalar upm = SkIntToScalar(typeface->getUnitsPerEm());
+    SkScalar size = font_data->paint_.getTextSize();
+    return SkiaScalarToHarfBuzzPosition(
+        SkScalarMulDiv(SkIntToScalar(kerningAdjustments[0]), size, upm));
+  }
+
+  return 0;
+}
+
 // Writes the |extents| of |glyph|.
 hb_bool_t GetGlyphExtents(hb_font_t* font,
                           void* data,
                           hb_codepoint_t glyph,
                           hb_glyph_extents_t* extents,
                           void* user_data) {
   FontData* font_data = reinterpret_cast<FontData*>(data);
 
   GetGlyphWidthAndExtents(&font_data->paint_, glyph, 0, extents);
   return true;
 }
 
 // Returns a HarfBuzz font data provider that uses Skia.
 hb_font_funcs_t* GetFontFuncs() {
   static hb_font_funcs_t* font_funcs = 0;
 
   // We don't set callback functions which we can't support.
   // HarfBuzz will use the fallback implementation if they aren't set.
-  // TODO(ckocagil): Merge Blink's kerning funcs.
   if (!font_funcs) {
     // The object created by |hb_font_funcs_create()| below lives indefinitely
     // and is intentionally leaked.
     font_funcs = hb_font_funcs_create();
     hb_font_funcs_set_glyph_func(font_funcs, GetGlyph, 0, 0);
     hb_font_funcs_set_glyph_h_advance_func(
         font_funcs, GetGlyphHorizontalAdvance, 0, 0);
+    hb_font_funcs_set_glyph_h_kerning_func(
+        font_funcs, GetGlyphHorizontalKerning, 0, 0);
     hb_font_funcs_set_glyph_h_origin_func(
         font_funcs, GetGlyphHorizontalOrigin, 0, 0);
+    hb_font_funcs_set_glyph_v_kerning_func(
+        font_funcs, GetGlyphVerticalKerning, 0, 0);
     hb_font_funcs_set_glyph_extents_func(
         font_funcs, GetGlyphExtents, 0, 0);
     hb_font_funcs_make_immutable(font_funcs);
   }
   return font_funcs;
 }
 
 // Returns the raw data of the font table |tag|.
 hb_blob_t* GetFontTable(hb_face_t* face, hb_tag_t tag, void* user_data) {
   SkTypeface* typeface = reinterpret_cast<SkTypeface*>(user_data);
@@ skipping 776 matching lines @@
     run->positions[i].set(run->width + x_offset, y_offset);
     run->width +=
         SkScalarRoundToInt(SkFixedToScalar(hb_positions[i].x_advance));
   }
 
   hb_buffer_destroy(buffer);
   hb_font_destroy(harfbuzz_font);
 }
 
 }  // namespace gfx