| Index: gm/pixelxorxfermode.cpp
|
| diff --git a/gm/pixelxorxfermode.cpp b/gm/pixelxorxfermode.cpp
|
| index 35926a81c6cd85a82153bc081c4b4ef01e9f5d1b..0ab08917aca8996ebab10e1a58e4c31a73748f53 100644
|
| --- a/gm/pixelxorxfermode.cpp
|
| +++ b/gm/pixelxorxfermode.cpp
|
| @@ -8,7 +8,8 @@
|
| #include "gm.h"
|
| #include "Resources.h"
|
|
|
| -#include "SkImageDecoder.h"
|
| +#include "SkData.h"
|
| +#include "SkImage.h"
|
| #include "SkPixelXorXfermode.h"
|
| #include "SkStream.h"
|
|
|
| @@ -24,17 +25,10 @@ protected:
|
| SkISize onISize() override { return SkISize::Make(512, 512); }
|
|
|
| void onOnceBeforeDraw() override {
|
| - SkImageDecoder* codec = nullptr;
|
| - SkString resourcePath = GetResourcePath("mandrill_512.png");
|
| - SkFILEStream stream(resourcePath.c_str());
|
| - if (stream.isValid()) {
|
| - codec = SkImageDecoder::Factory(&stream);
|
| - }
|
| - if (codec) {
|
| - stream.rewind();
|
| - codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode);
|
| - delete codec;
|
| - } else {
|
| + SkAutoTUnref<SkData> data(SkData::NewFromFileName(
|
| + GetResourcePath("mandrill_512.png").c_str()));
|
| + SkAutoTDelete<SkImage> image(SkImage::NewFromEncoded(data));
|
| + if (!image || !image->asLegacyBitmap(&fBM, SkImage::kRW_LegacyBitmapMode)) {
|
| fBM.allocN32Pixels(1, 1);
|
| fBM.eraseARGB(255, 255, 0 , 0); // red == bad
|
| }
|
|
|