SkAdvancedTypefaceMetrics: getAdvanceData uses std::function

src/ports/SkFontHost_FreeType.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 596 matching lines @@
                 }
                 FT_Get_Advances(face, gID, advanceCount, FT_LOAD_NO_SCALE, advances);
                 for (int i = 0; i < advanceCount; i++) {
                     int16_t advance = advances[i];
                     info->fGlyphWidths->fAdvance.append(1, &advance);
                 }
             }
             finishRange(info->fGlyphWidths.get(), face->num_glyphs - 1,
                         SkAdvancedTypefaceMetrics::WidthRange::kRange);
         } else {
+            std::function<bool(int gId, int16_t* data)> getWidthAdvanceFn =

[herb_g, 2016/05/06 15:54:16]

Use auto instead of std::function...
Here and other places.

[tomhudson, 2016/05/06 15:58:02]

Nit: with auto, the return value is totally implicit, even if the parameter
types are still easily inspectable?

[hal.canary, 2016/05/06 16:00:56]

Done.

+                [face](int gId, int16_t* data) {
+                return getWidthAdvance(face, gId, data);
+            };
             info->fGlyphWidths.reset(
-                getAdvanceData(face,
-                               face->num_glyphs,
+                getAdvanceData(face->num_glyphs,
                                glyphIDs,
                                glyphIDsCount,
-                               &getWidthAdvance));
+                               getWidthAdvanceFn));
         }
     }
 
     if (perGlyphInfo & kVAdvance_PerGlyphInfo &&
             FT_HAS_VERTICAL(face)) {
         SkASSERT(false);  // Not implemented yet.
     }
 
     if (perGlyphInfo & kGlyphNames_PerGlyphInfo &&
             info->fType == SkAdvancedTypefaceMetrics::kType1_Font) {
@@ skipping 1186 matching lines @@
                 SkDEBUGF(("Requested font axis not found: %s '%c%c%c%c'\n",
                           name.c_str(),
                           (skTag >> 24) & 0xFF,
                           (skTag >> 16) & 0xFF,
                           (skTag >>  8) & 0xFF,
                           (skTag)       & 0xFF));
             }
         }
     )
 }