diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-27 14:14:22 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-27 14:14:22 +0000 |
| commit | 2d970b5128f7270cd01a93e4ce68d0c3ea67ac71 (patch) | |
| tree | 2592f202dfb36d05e42004ecdb237ddd4471ef9e /src/lazy | |
| parent | 851155c28e18e3f5b702ef15ee7bfb12f3cbacda (diff) | |
hide discardable factory from public imagegenerator api
BUG=skia:
R=halcanary@google.com, scroggo@google.com, djsollen@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/295243006
git-svn-id: http://skia.googlecode.com/svn/trunk@14889 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/lazy')
| -rw-r--r-- | src/lazy/SkDiscardablePixelRef.cpp | 9 | ||||
| -rw-r--r-- | src/lazy/SkDiscardablePixelRef.h | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp index 56b94b734e..267e097245 100644 --- a/src/lazy/SkDiscardablePixelRef.cpp +++ b/src/lazy/SkDiscardablePixelRef.cpp @@ -77,8 +77,7 @@ void SkDiscardablePixelRef::onUnlockPixels() { fDiscardableMemory->unlock(); } -bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, - SkBitmap* dst, +bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst, SkDiscardableMemory::Factory* factory) { SkImageInfo info; SkAutoTDelete<SkImageGenerator> autoGenerator(generator); @@ -97,3 +96,9 @@ bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, dst->setPixelRef(ref); return true; } + +// This is the public API +bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst) { + return SkInstallDiscardablePixelRef(generator, dst, NULL); +} + diff --git a/src/lazy/SkDiscardablePixelRef.h b/src/lazy/SkDiscardablePixelRef.h index cbc2a89ac4..e5e1c9f0e1 100644 --- a/src/lazy/SkDiscardablePixelRef.h +++ b/src/lazy/SkDiscardablePixelRef.h @@ -52,8 +52,7 @@ private: size_t rowBytes, SkDiscardableMemory::Factory* factory); - friend bool SkInstallDiscardablePixelRef(SkImageGenerator*, - SkBitmap*, + friend bool SkInstallDiscardablePixelRef(SkImageGenerator*, SkBitmap*, SkDiscardableMemory::Factory*); typedef SkPixelRef INHERITED; |