SkAdvancedTypefaceMetrics: getAdvanceData uses std::function

src/ports/SkFontHost_FreeType.cpp

Index: src/ports/SkFontHost_FreeType.cpp
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index b53364eacb47eab195b7b6cc7269143736a62e3b..b1ab31d79913e669baadb9e1d34b62d7227d1fa7 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -614,12 +614,15 @@ SkAdvancedTypefaceMetrics* SkTypeface_FreeType::onGetAdvancedTypefaceMetrics(
             finishRange(info->fGlyphWidths.get(), face->num_glyphs - 1,
                         SkAdvancedTypefaceMetrics::WidthRange::kRange);
         } else {
+            std::function<bool(int gId, int16_t* data)> getWidthAdvanceFn =
+                [face](int gId, int16_t* data) {

[bungeman-skia, 2016/05/09 00:14:08]

I kinda understand why, but this indentation is just weird. The brace is at the
end of this line but the beginning of the line doesn't line up with the closing
brace below. I think this awkwardness (and the somewhat awkward name
'getWidthAdvanceFn') can be alleviated by just not naming it.

[hal.canary, 2016/05/09 12:15:08]

Done.

+                return getWidthAdvance(face, gId, data);
+            };
             info->fGlyphWidths.reset(
-                getAdvanceData(face,
-                               face->num_glyphs,
+                getAdvanceData(face->num_glyphs,
                                glyphIDs,
                                glyphIDsCount,
-                               &getWidthAdvance));
+                               getWidthAdvanceFn));
         }
     }