AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SK_SUPPORT_LEGACY_DATA_FACTORIES.

Browse Source 
The code protected by this flag is no longer used. Remove the flag and
code. This also removes SK_SUPPORT_LEGACY_TYPEFACE_PTR from Android, as
it is no longer needed.

TBR=reed
Only removes already guarded API.

Review-Url: https://codereview.chromium.org/2223933002
This commit is contained in:
bungeman 2016-08-08 08:09:10 -07:00 committed by Commit bot
parent 9be372041e
commit f95388da1a
3 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gyp/skia_for_android_framework_defines.gypi
View File

@ -28,9 +28,7 @@
'SK_SUPPORT_LEGACY_MASKFILTER_PTR',
'SK_SUPPORT_LEGACY_IMAGEFACTORY',
'SK_SUPPORT_LEGACY_XFERMODE_PTR',
'SK_SUPPORT_LEGACY_TYPEFACE_PTR',
'SK_IGNORE_GPU_DITHER',
'SK_SUPPORT_LEGACY_DATA_FACTORIES',
],
},
}

39
include/core/SkData.h
View File

@ -67,9 +67,6 @@ public:
* effectively returning 0 == memcmp(...)
*/
bool equals(const SkData* other) const;
#ifdef SK_SUPPORT_LEGACY_DATA_FACTORIES
bool equals(sk_sp<const SkData>& other) const { return this->equals(other.get()); }
#endif
/**
* Function that, if provided, will be called when the SkData goes out
@ -160,37 +157,6 @@ public:
*/
static sk_sp<SkData> MakeEmpty();
#ifdef SK_SUPPORT_LEGACY_DATA_FACTORIES
static SkData* NewWithCopy(const void* data, size_t length) {
return MakeWithCopy(data, length).release();
}
static SkData* NewUninitialized(size_t length) {
return MakeUninitialized(length).release();
}
static SkData* NewWithCString(const char cstr[]) {
return MakeWithCString(cstr).release();
}
static SkData* NewWithProc(const void* ptr, size_t length, ReleaseProc proc, void* context) {
return MakeWithProc(ptr, length, proc, context).release();
}
static SkData* NewWithoutCopy(const void* data, size_t length) {
return MakeWithoutCopy(data, length).release();
}
static SkData* NewFromMalloc(const void* data, size_t length) {
return MakeFromMalloc(data, length).release();
}
static SkData* NewFromFileName(const char path[]) { return MakeFromFileName(path).release(); }
static SkData* NewFromFILE(FILE* f) { return MakeFromFILE(f).release(); }
static SkData* NewFromFD(int fd) { return MakeFromFD(fd).release(); }
static SkData* NewFromStream(SkStream* stream, size_t size) {
return MakeFromStream(stream, size).release();
}
static SkData* NewSubset(const SkData* src, size_t offset, size_t length) {
return MakeSubset(src, offset, length).release();
}
static SkData* NewEmpty() { return MakeEmpty().release(); }
#endif
private:
ReleaseProc fReleaseProc;
void* fReleaseProcContext;
@ -221,9 +187,4 @@ private:
typedef SkRefCnt INHERITED;
};
#ifdef SK_SUPPORT_LEGACY_DATA_FACTORIES
/** Typedef of SkAutoTUnref<SkData> for automatically unref-ing a SkData. */
typedef SkAutoTUnref<SkData> SkAutoDataUnref;
#endif
#endif

1
public.bzl
View File

@ -616,7 +616,6 @@ DEFINES_ALL = [
"SK_SUPPORT_LEGACY_PICTURE_PTR",
"SK_SUPPORT_LEGACY_TYPEFACE_PTR",
"SK_SUPPORT_LEGACY_XFERMODE_PTR",
"SK_SUPPORT_LEGACY_DATA_FACTORIES",
]
################################################################################