aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/codec/SkAndroidCodec.cpp
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2016-01-25 06:05:19 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-01-25 06:05:19 -0800
commitc85a9fde77f91979afea0efa38f63d8efceb4138 (patch)
tree09f04bb695a9702a7f365f1f861489a74a3a1437 /src/codec/SkAndroidCodec.cpp
parentfc75253c82f838d0e687d05f5d7f82ebe6f26d5b (diff)
Revert of Prototype of RAW decoding in Skia. (patchset #32 id:610001 of https://codereview.chromium.org/1520403003/ )
Reason for revert: A few build failures on Chrome OS/Android. Original issue's description: > Add RAW decoding into Skia. > > TBR=reed@google.com > > BUG=skia: > > (Based on the work from ebrauer in https://codereview.chromium.org/1459473007) > (Based on the work from adaubert in https://codereview.chromium.org/1494003003) > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1520403003 > > Committed: https://skia.googlesource.com/skia/+/6bd8639f8c142eedf543f4e5f3b02d2bf11df308 TBR=scroggo@google.com,adaubert@google.com,yujieqin@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/1635443002
Diffstat (limited to 'src/codec/SkAndroidCodec.cpp')
-rw-r--r--src/codec/SkAndroidCodec.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp
index 6c3113ccfc..d309d58501 100644
--- a/src/codec/SkAndroidCodec.cpp
+++ b/src/codec/SkAndroidCodec.cpp
@@ -8,9 +8,6 @@
#include "SkAndroidCodec.h"
#include "SkCodec.h"
#include "SkCodecPriv.h"
-#ifdef SK_CODEC_DECODES_RAW
-#include "SkRawAdapterCodec.h"
-#endif
#include "SkSampledCodec.h"
#include "SkWebpAdapterCodec.h"
@@ -40,10 +37,6 @@ SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream, SkPngChunkReader
case kGIF_SkEncodedFormat:
case kICO_SkEncodedFormat:
return new SkSampledCodec(codec.detach());
-#ifdef SK_CODEC_DECODES_RAW
- case kRAW_SkEncodedFormat:
- return new SkRawAdapterCodec((SkRawCodec*)codec.detach());
-#endif
default:
return nullptr;
}