diff options
| author |  reed <reed@google.com> | 2015-09-25 06:56:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-25 06:56:57 -0700 |
| commit | d114645d931d4e95a938597a45a270f211273c17 (patch) | |
| tree | 195585704f873e84248a8c44e80c366025066ba2 /src/lazy | |
| parent | 57b767127f88b4794f7e42e659b585b3b82203c5 (diff) | |
SkInstallDiscardablePixelRef is deprecated, enforce that
No functionality change, just a renaming.
BUG=skia:
TBR=
Review URL: https://codereview.chromium.org/1372593002
Diffstat (limited to 'src/lazy')
| -rw-r--r-- | src/lazy/SkDiscardablePixelRef.cpp | 13 | ||||
| -rw-r--r-- | src/lazy/SkDiscardablePixelRef.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp index 9ac9819e92..0cb0e02c27 100644 --- a/src/lazy/SkDiscardablePixelRef.cpp +++ b/src/lazy/SkDiscardablePixelRef.cpp @@ -101,8 +101,8 @@ void SkDiscardablePixelRef::onUnlockPixels() { fDiscardableMemoryIsLocked = false; } -bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, const SkIRect* subset, SkBitmap* dst, - SkDiscardableMemory::Factory* factory) { +bool SkDEPRECATED_InstallDiscardablePixelRef(SkImageGenerator* generator, const SkIRect* subset, + SkBitmap* dst, SkDiscardableMemory::Factory* factory) { SkAutoTDelete<SkImageGenerator> autoGenerator(generator); if (nullptr == autoGenerator.get()) { return false; @@ -144,11 +144,12 @@ bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, const SkIRect* su // These are the public API -bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst) { - return SkInstallDiscardablePixelRef(generator, nullptr, dst, nullptr); +bool SkDEPRECATED_InstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst) { + return SkDEPRECATED_InstallDiscardablePixelRef(generator, nullptr, dst, nullptr); } -bool SkInstallDiscardablePixelRef(SkData* encoded, SkBitmap* dst) { +bool SkDEPRECATED_InstallDiscardablePixelRef(SkData* encoded, SkBitmap* dst) { SkImageGenerator* generator = SkImageGenerator::NewFromEncoded(encoded); - return generator ? SkInstallDiscardablePixelRef(generator, nullptr, dst, nullptr) : false; + return generator ? + SkDEPRECATED_InstallDiscardablePixelRef(generator, nullptr, dst, nullptr) : false; } diff --git a/src/lazy/SkDiscardablePixelRef.h b/src/lazy/SkDiscardablePixelRef.h index 3b38fa669c..695d441d2b 100644 --- a/src/lazy/SkDiscardablePixelRef.h +++ b/src/lazy/SkDiscardablePixelRef.h @@ -66,7 +66,7 @@ private: return fGenerator->getYUV8Planes(sizes, planes, rowBytes, colorSpace); } - friend bool SkInstallDiscardablePixelRef(SkImageGenerator*, const SkIRect*, SkBitmap*, + friend bool SkDEPRECATED_InstallDiscardablePixelRef(SkImageGenerator*, const SkIRect*, SkBitmap*, SkDiscardableMemory::Factory*); typedef SkPixelRef INHERITED; |