simplify release-proc for SkData, removing unneeded size param

include/core/SkData.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkData_DEFINED
 #define SkData_DEFINED
 
@@ skipping 53 matching lines @@
     size_t copyRange(size_t offset, size_t length, void* buffer) const;
 
     /**
      *  Returns true if these two objects have the same length and contents,
      *  effectively returning 0 == memcmp(...)
      */
     bool equals(const SkData* other) const;
 
     /**
      *  Function that, if provided, will be called when the SkData goes out
-     *  of scope, allowing for custom allocation/freeing of the data.
+     *  of scope, allowing for custom allocation/freeing of the data's contents.
      */
-    typedef void (*ReleaseProc)(const void* ptr, size_t length, void* context);
+    typedef void (*ReleaseProc)(const void* ptr, void* context);
 
     /**
      *  Create a new dataref by copying the specified data
      */
     static SkData* NewWithCopy(const void* data, size_t length);
 
     /**
      *  Create a new data with uninitialized contents. The caller should call writable_data()
      *  to write into the buffer, but this must be done before another ref() is made.
      */
     static SkData* NewUninitialized(size_t length);
 
     /**
      *  Create a new dataref by copying the specified c-string
      *  (a null-terminated array of bytes). The returned SkData will have size()
      *  equal to strlen(cstr) + 1. If cstr is NULL, it will be treated the same
      *  as "".
      */
     static SkData* NewWithCString(const char cstr[]);
 
     /**
-     *  Create a new dataref, taking the data ptr as is, and using the
+     *  Create a new dataref, taking the ptr as is, and using the
      *  releaseproc to free it. The proc may be NULL.
      */
-    static SkData* NewWithProc(const void* data, size_t length, ReleaseProc proc, void* context);
+    static SkData* NewWithProc(const void* ptr, size_t length, ReleaseProc proc, void* context);
+
+#ifdef SK_SUPPORT_LEGACY_DATARELEASEPROC_PARAMS
+    // This variant is temporary.
+    // Its signature is meant to match an older version of the API
+    typedef void (*LegacyReleaseProc)(const void* ptr, size_t size, void* ctx);
+    static SkData* NewWithProc(const void* ptr, size_t length, LegacyReleaseProc proc, void* ctx);
+#endif
 
     /**
      *  Call this when the data parameter is already const and will outlive the lifetime of the
      *  SkData. Suitable for with const globals.
      */
     static SkData* NewWithoutCopy(const void* data, size_t length) {
-        return NewWithProc(data, length, NULL, NULL);
+        return NewWithProc(data, length, DummyReleaseProc, NULL);
     }
 
     /**
      *  Create a new dataref from a pointer allocated by malloc. The Data object
      *  takes ownership of that allocation, and will handling calling sk_free.
      */
     static SkData* NewFromMalloc(const void* data, size_t length);
 
     /**
      *  Create a new dataref the file with the specified path.
@@ skipping 34 matching lines @@
 
     /**
      *  Returns a new empty dataref (or a reference to a shared empty dataref).
      *  New or shared, the caller must see that unref() is eventually called.
      */
     static SkData* NewEmpty();
 
 private:
     ReleaseProc fReleaseProc;
     void*       fReleaseProcContext;
+#ifdef SK_SUPPORT_LEGACY_DATARELEASEPROC_PARAMS
+    LegacyReleaseProc fLegacyReleaseProc;
+#endif
 
     void*       fPtr;
     size_t      fSize;
 
+#ifdef SK_SUPPORT_LEGACY_DATARELEASEPROC_PARAMS
+    SkData(const void* ptr, size_t size, ReleaseProc, void* context, LegacyReleaseProc = NULL);
+#else
     SkData(const void* ptr, size_t size, ReleaseProc, void* context);
+#endif
     SkData(size_t size);   // inplace new/delete
     virtual ~SkData();
 
 
     // Objects of this type are sometimes created in a custom fashion using sk_malloc_throw and
     // therefore must be sk_freed. We overload new to also call sk_malloc_throw so that memory
     // can be unconditionally released using sk_free in an overloaded delete. Overloading regular
     // new means we must also overload placement new.
     void* operator new(size_t size) { return sk_malloc_throw(size); }
     void* operator new(size_t, void* p) { return p; }
     void operator delete(void* p) { sk_free(p); }
 
     // Called the first time someone calls NewEmpty to initialize the singleton.
     friend SkData* sk_new_empty_data();
 
     // shared internal factory
     static SkData* PrivateNewWithCopy(const void* srcOrNull, size_t length);
 
+    static void DummyReleaseProc(const void*, void*) {}
+
     typedef SkRefCnt INHERITED;
 };
 
 /** Typedef of SkAutoTUnref<SkData> for automatically unref-ing a SkData. */
 typedef SkAutoTUnref<SkData> SkAutoDataUnref;
 
 #endif