Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(723)

Unified Diff: include/core/SkData.h

Issue 1173173007: remove dead guarded code for legacy SkData proc (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/core/SkData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkData.h
diff --git a/include/core/SkData.h b/include/core/SkData.h
index 8a37cdee0741edf74751484fff99fde8c92bb40c..d9dd22de9df015a008a665de211e9d7fd1ca05e8 100644
--- a/include/core/SkData.h
+++ b/include/core/SkData.h
@@ -100,13 +100,6 @@ public:
*/
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.
@@ -167,19 +160,11 @@ public:
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
+ explicit SkData(size_t size); // inplace new/delete
virtual ~SkData();
« no previous file with comments | « no previous file | src/core/SkData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698