SkAdvancedTypefaceMetrics: getAdvanceData uses std::function

tests/WArrayTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 
 // Include the implementation so we can make an appropriate template instance.
@@ skipping 133 matching lines @@
         this->runTest(reporter);
     }
 
   private:
     const int16_t* fAdvances;
     const int fAdvancesLen;
     const uint32_t* fSubset;
     const int fSubsetLen;
     const char* fExpected;
 
-    static bool getAdvance(void* tc, int gId, int16_t* advance) {
-        TestWData* testCase = (TestWData*)tc;
-        if (gId >= 0 && gId < testCase->fAdvancesLen) {
-            *advance = testCase->fAdvances[gId];
-            return true;
-        }
-        return false;
-    }
-
     void runTest(skiatest::Reporter* reporter) {
         SkAutoTDelete<SkAdvancedTypefaceMetrics::AdvanceMetric<int16_t> > result;
-        result.reset(getAdvanceData((void*)this, fAdvancesLen, fSubset, fSubsetLen, getAdvance));
+        std::function<bool(int gId, int16_t* data)> getWidthAdvanceFn =
+            [this](int gId, int16_t* advance) {
+                if (gId >= 0 && gId < fAdvancesLen) {
+                    *advance = fAdvances[gId];
+                    return true;
+                }
+                return false;
+            };
+        result.reset(getAdvanceData(fAdvancesLen, fSubset, fSubsetLen, getWidthAdvanceFn));
 
         SkString stringResult = stringify_advance_data(result);
         if (!stringResult.equals(fExpected)) {
             ERRORF(reporter, "Expected: %s\n  Result: %s\n", fExpected, stringResult.c_str());
         }
     }
 };
 
 DEF_TEST(WArray, reporter) {
     TestWData(reporter, data1, SK_ARRAY_COUNT(data1), nullptr, 0, expected1);
@@ skipping 20 matching lines @@
     TestWData(reporter, data12, SK_ARRAY_COUNT(data12), nullptr, 0, expected12);
     TestWData(reporter, data12, SK_ARRAY_COUNT(data12), subset12,
               SK_ARRAY_COUNT(subset12), expectedSubset12);
     TestWData(reporter, data13, SK_ARRAY_COUNT(data13), nullptr, 0, expected13);
     TestWData(reporter, data13, SK_ARRAY_COUNT(data13), subset13,
               SK_ARRAY_COUNT(subset13), expectedSubset13);
     TestWData(reporter, data14, SK_ARRAY_COUNT(data14), nullptr, 0, expected14);
     TestWData(reporter, data14, SK_ARRAY_COUNT(data14), subset14,
               SK_ARRAY_COUNT(subset14), expectedSubset14);
 }