simplify release-proc for SkData, removing unneeded size param

tests/DataRefTest.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 "SkData.h"
 #include "SkDataTable.h"
 #include "SkOSFile.h"
@@ skipping 125 matching lines @@
 DEF_TEST(DataTable, reporter) {
     test_emptytable(reporter);
     test_simpletable(reporter);
     test_vartable(reporter);
     test_tablebuilder(reporter);
     test_globaltable(reporter);
 }
 
 static void* gGlobal;
 
-static void delete_int_proc(const void* ptr, size_t len, void* context) {
+static void delete_int_proc(const void* ptr, void* context) {
     int* data = (int*)ptr;
     SkASSERT(context == gGlobal);
     delete[] data;
 }
 
+#ifdef SK_SUPPORT_LEGACY_DATARELEASEPROC_PARAMS
+static void legacy_delete_int_proc(const void* ptr, size_t size, void* context) {
+    int* data = (int*)ptr;
+    SkASSERT(context == gGlobal);
+    delete[] data;
+}
+#endif
+
 static void assert_len(skiatest::Reporter* reporter, SkData* ref, size_t len) {
     REPORTER_ASSERT(reporter, ref->size() == len);
 }
 
 static void assert_data(skiatest::Reporter* reporter, SkData* ref,
                         const void* data, size_t len) {
     REPORTER_ASSERT(reporter, ref->size() == len);
     REPORTER_ASSERT(reporter, !memcmp(ref->data(), data, len));
 }
 
@@ skipping 44 matching lines @@
 
 DEF_TEST(Data, reporter) {
     const char* str = "We the people, in order to form a more perfect union.";
     const int N = 10;
 
     SkAutoTUnref<SkData> r0(SkData::NewEmpty());
     SkAutoTUnref<SkData> r1(SkData::NewWithCopy(str, strlen(str)));
     SkAutoTUnref<SkData> r2(SkData::NewWithProc(new int[N], N*sizeof(int),
                                            delete_int_proc, gGlobal));
     SkAutoTUnref<SkData> r3(SkData::NewSubset(r1, 7, 6));
+#ifdef SK_SUPPORT_LEGACY_DATARELEASEPROC_PARAMS
+    SkAutoTUnref<SkData> r4(SkData::NewWithProc(new int[N], N*sizeof(int),
+                                                legacy_delete_int_proc, gGlobal));
+#endif
 
     assert_len(reporter, r0, 0);
     assert_len(reporter, r1, strlen(str));
     assert_len(reporter, r2, N * sizeof(int));
     assert_len(reporter, r3, 6);
 
     assert_data(reporter, r1, str, strlen(str));
     assert_data(reporter, r3, "people", 6);
 
     SkData* tmp = SkData::NewSubset(r1, strlen(str), 10);
@@ skipping 80 matching lines @@
     }
 
     for (int i = 0; i < N; ++i) {
         REPORTER_ASSERT(reporter, (i + 1) * 26U == readers[i]->size());
         check_alphabet_buffer(reporter, readers[i]);
         check_alphabet_stream(reporter, streams[i]);
         readers[i]->unref();
         SkDELETE(streams[i]);
     }
 }