diff options
author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-11 18:04:56 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-11 18:04:56 +0000 |
commit | 6965a0a2df9d35cd0a25e1738f0388272d03f399 (patch) | |
tree | c7831828095cbd2ea1efe9b44ab876f1aa374f80 /tests/PictureTest.cpp | |
parent | 3a6143d91f06d01f07b3b0e8adfa703a574d2bec (diff) |
PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is to refactor bitmap later to remove redundancy, and more interestingly, remove the chance for a disconnect between the actual (pixelref) rowbytes and config, and the one claimed by the bitmap.""""
BUG=
Review URL: https://codereview.chromium.org/110503003
git-svn-id: http://skia.googlecode.com/svn/trunk@12622 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/PictureTest.cpp')
-rw-r--r-- | tests/PictureTest.cpp | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp index 9ef4bb06bd..3c53dd3838 100644 --- a/tests/PictureTest.cpp +++ b/tests/PictureTest.cpp @@ -9,6 +9,7 @@ #include "SkCanvas.h" #include "SkColorPriv.h" #include "SkData.h" +#include "SkDecodingImageGenerator.h" #include "SkError.h" #include "SkPaint.h" #include "SkPicture.h" @@ -335,32 +336,6 @@ static void test_bad_bitmap() { } #endif -#include "SkData.h" -#include "SkImageRef_GlobalPool.h" -// Class to test SkPixelRef::onRefEncodedData, since there are currently no implementations in skia. -class SkDataImageRef : public SkImageRef_GlobalPool { - -public: - SkDataImageRef(SkMemoryStream* stream) - : SkImageRef_GlobalPool(stream, SkBitmap::kNo_Config) { - SkASSERT(stream != NULL); - fData = stream->copyToData(); - this->setImmutable(); - } - - ~SkDataImageRef() { - fData->unref(); - } - - virtual SkData* onRefEncodedData() SK_OVERRIDE { - fData->ref(); - return fData; - } - -private: - SkData* fData; -}; - #include "SkImageEncoder.h" static SkData* encode_bitmap_to_data(size_t* offset, const SkBitmap& bm) { @@ -402,14 +377,10 @@ static void test_bitmap_with_encoded_data(skiatest::Reporter* reporter) { return; } SkAutoDataUnref data(wStream.copyToData()); - SkMemoryStream memStream; - memStream.setData(data); - // Use the encoded bitmap as the data for an image ref. SkBitmap bm; - SkAutoTUnref<SkDataImageRef> imageRef(SkNEW_ARGS(SkDataImageRef, (&memStream))); - imageRef->getInfo(&bm); - bm.setPixelRef(imageRef); + bool installSuccess = SkDecodingImageGenerator::Install(data, &bm); + REPORTER_ASSERT(reporter, installSuccess); // Write both bitmaps to pictures, and ensure that the resulting data streams are the same. // Flattening original will follow the old path of performing an encode, while flattening bm |