Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2235)

Unified Diff: gm/pixelxorxfermode.cpp

Issue 1791583002: Remove uses of SkImageDecoder from gms (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
}
« gm/filterbitmap.cpp ('K') | « gm/filterindiabox.cpp ('k') | gm/showmiplevels.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698