diff options
| author | halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-10 21:11:12 +0000 |
|---|---|---|
| committer | halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-10 21:11:12 +0000 |
| commit | edd370f949a457f5d8f7a62efdaf685d4caf46fe (patch) | |
| tree | ccb79dcfeedf361e44488f67cb22350dd8c97aa0 /tests/CachedDecodingPixelRefTest.cpp | |
| parent | a3b84d41efbbc5ab1e050a33d66dca4d1c44c9e3 (diff) | |
Sk_API for SkImageGenerator and SkInstallDiscardablePixelRef
Added SK_API to SkImageGenerator (already in include/).
Moved SkDiscardablePixelRef::Install to SkInstallDiscardablePixelRef,
added SK_API to that function, and moved declaration to
SkImageGenerator.h
This keeps the SkDiscardablePixelRef internal to Skia, but exposes a
method to install it into a bitmap.
Modifed tests that rely on this functio to use new version.
BUG=
R=mtklein@google.com, reed@google.com
Review URL: https://codereview.chromium.org/111713002
git-svn-id: http://skia.googlecode.com/svn/trunk@12612 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/CachedDecodingPixelRefTest.cpp')
| -rw-r--r-- | tests/CachedDecodingPixelRefTest.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp index 1e4ab3f35d..f97e89361f 100644 --- a/tests/CachedDecodingPixelRefTest.cpp +++ b/tests/CachedDecodingPixelRefTest.cpp @@ -9,7 +9,6 @@ #include "SkCanvas.h" #include "SkData.h" #include "SkDecodingImageGenerator.h" -#include "SkDiscardablePixelRef.h" #include "SkDiscardableMemoryPool.h" #include "SkImageDecoder.h" #include "SkCachingPixelRef.h" @@ -257,7 +256,7 @@ void CheckPixelRef(TestImageGenerator::TestType type, // Ignore factory; use global SkScaledImageCache. success = SkCachingPixelRef::Install(gen.detach(), &lazy); } else { - success = SkDiscardablePixelRef::Install(gen.detach(), &lazy, factory); + success = SkInstallDiscardablePixelRef(gen.detach(), &lazy, factory); } REPORTER_ASSERT(reporter, success == (TestImageGenerator::kFailGetInfo_TestType != type)); |