simplify release-proc for SkData, removing unneeded size param
request https://codereview.chromium.org/1184953005 to land first
BUG=skia:
Review URL: https://codereview.chromium.org/1193553002
diff --git a/tests/DataRefTest.cpp b/tests/DataRefTest.cpp
index 981ac54..9fcbeb0 100644
--- a/tests/DataRefTest.cpp
+++ b/tests/DataRefTest.cpp
@@ -143,12 +143,20 @@
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);
}
@@ -213,6 +221,10 @@
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));