diff options
| author |  bungeman <bungeman@google.com> | 2016-03-17 10:38:36 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-17 10:38:36 -0700 |
| commit | 003571887de747942478e33d4e2ff40bf3a65a72 (patch) | |
| tree | 4fb749c278196cca261c58120099365143675cd0 /gm/pixelxorxfermode.cpp | |
| parent | c85ce7ce805135d34b11067c502a5f88506cce44 (diff) | |
Revert of Remove uses of SkImageDecoder from gms (patchset #2 id:20001 of https://codereview.chromium.org/1791583002/ )
Reason for revert:
Suspected of causing assertion failures in unrelated tests on Windows.
Original issue's description:
> Remove uses of SkImageDecoder from gms
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1791583002
>
> Committed: https://skia.googlesource.com/skia/+/d427266a58af7e6ea6c12c9cd56ade3e179a0c04
TBR=scroggo@google.com,reed@google.com,msarett@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1806383002
Diffstat (limited to 'gm/pixelxorxfermode.cpp')
| -rw-r--r-- | gm/pixelxorxfermode.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gm/pixelxorxfermode.cpp b/gm/pixelxorxfermode.cpp index daccca8c41..35926a81c6 100644 --- a/gm/pixelxorxfermode.cpp +++ b/gm/pixelxorxfermode.cpp @@ -8,6 +8,7 @@ #include "gm.h" #include "Resources.h" +#include "SkImageDecoder.h" #include "SkPixelXorXfermode.h" #include "SkStream.h" @@ -23,7 +24,17 @@ protected: SkISize onISize() override { return SkISize::Make(512, 512); } void onOnceBeforeDraw() override { - if (!GetResourceAsBitmap("mandrill_512.png", &fBM)) { + 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 { fBM.allocN32Pixels(1, 1); fBM.eraseARGB(255, 255, 0 , 0); // red == bad } |