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

remove obsolete code for SK_SUPPORT_LEGACY_IMAGEGENERATORAPI

Browse Source 
BUG=skia:
R=reed@google.com

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/613933002
This commit is contained in:
reed 2014-09-30 10:15:32 -07:00 committed by Commit bot
parent fffa16cc27
commit 7874dc8e71
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/core/SkImageGenerator.h
View File

@ -48,13 +48,6 @@ public:
*/
virtual ~SkImageGenerator() { }
#ifdef SK_SUPPORT_LEGACY_IMAGEGENERATORAPI
virtual SkData* refEncodedData() { return this->onRefEncodedData(); }
virtual bool getInfo(SkImageInfo* info) { return this->onGetInfo(info); }
virtual bool getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes) {
return this->onGetPixels(info, pixels, rowBytes, NULL, NULL);
}
#else
/**
* Return a ref to the encoded (i.e. compressed) representation,
* of this data.
@ -108,7 +101,6 @@ public:
* Simplified version of getPixels() that asserts that info is NOT kIndex8_SkColorType.
*/
bool getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes);
#endif
/**
* If planes or rowBytes is NULL or if any entry in planes is NULL or if any entry in rowBytes

2
src/core/SkImageGenerator.cpp
View File

@ -7,7 +7,6 @@
#include "SkImageGenerator.h"
#ifndef SK_SUPPORT_LEGACY_IMAGEGENERATORAPI
bool SkImageGenerator::getInfo(SkImageInfo* info) {
SkImageInfo dummy;
if (NULL == info) {
@ -55,7 +54,6 @@ bool SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels, size_t r
}
return this->getPixels(info, pixels, rowBytes, NULL, NULL);
}
#endif
bool SkImageGenerator::getYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
SkYUVColorSpace* colorSpace) {

4
src/lazy/SkDiscardablePixelRef.cpp
View File

@ -64,11 +64,7 @@ bool SkDiscardablePixelRef::onNewLockPixels(LockRec* rec) {
SkPMColor colors[256];
int colorCount = 0;
#ifdef SK_SUPPORT_LEGACY_IMAGEGENERATORAPI
if (!fGenerator->getPixels(info, pixels, fRowBytes)) {
#else
if (!fGenerator->getPixels(info, pixels, fRowBytes, colors, &colorCount)) {
#endif
fDiscardableMemory->unlock();
SkDELETE(fDiscardableMemory);
fDiscardableMemory = NULL;