commit 7d1c9ec49f8a846cef833a0f956cf9c91a298145
author Brian Osman <brianosman@google.com> Thu Oct 25 13:03:02 2018 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 25 13:03:10 2018 +0000
tree e60bf113acc9e1d4276826dec128704204111e16
parent dfca8f6adb6bcfdeb250bacf399717dbe3fdac8e

Revert "New GIF codec; new third_party/wuffs dep"

This reverts commit 60009388be154f9f65b9e3336c0b460851541aef.

Reason for revert: Breaking Google3 roll.

Original change's description:
> New GIF codec; new third_party/wuffs dep
> 
> Bug: skia:8235
> Change-Id: I883e05bc50c48f822b5ac3884f25ae67d21c94a9
> Reviewed-on: https://skia-review.googlesource.com/c/136940
> Commit-Queue: Leon Scroggins <scroggo@google.com>
> Reviewed-by: Leon Scroggins <scroggo@google.com>

TBR=scroggo@google.com,nigeltao@google.com

Change-Id: I515c5144d0475173ce8f854f4f00f59c4655fdc4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:8235
Reviewed-on: https://skia-review.googlesource.com/c/164903
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/codec/SkCodec.cpp

diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp
index 626de9f..dfd1e0a 100644
--- a/src/codec/SkCodec.cpp
+++ b/src/codec/SkCodec.cpp
@@ -11,6 +11,7 @@
 #include "SkColorSpace.h"
 #include "SkData.h"
 #include "SkFrameHolder.h"
+#include "SkGifCodec.h"
 #include "SkHalf.h"
 #ifdef SK_HAS_HEIF_LIBRARY
 #include "SkHeifCodec.h"
@@ -24,11 +25,6 @@
 #include "SkStream.h"
 #include "SkWbmpCodec.h"
 #include "SkWebpCodec.h"
-#ifdef SK_HAS_WUFFS_LIBRARY
-#include "SkWuffsCodec.h"
-#else
-#include "SkGifCodec.h"
-#endif
 
 struct DecoderProc {
     bool (*IsFormat)(const void*, size_t);
@@ -42,11 +38,7 @@
 #ifdef SK_HAS_WEBP_LIBRARY
     { SkWebpCodec::IsWebp, SkWebpCodec::MakeFromStream },
 #endif
-#ifdef SK_HAS_WUFFS_LIBRARY
-    { SkWuffsCodec_IsFormat, SkWuffsCodec_MakeFromStream },
-#else
     { SkGifCodec::IsGif, SkGifCodec::MakeFromStream },
-#endif
 #ifdef SK_HAS_PNG_LIBRARY
     { SkIcoCodec::IsIco, SkIcoCodec::MakeFromStream },
 #endif