From 742a3e298fda669006147e4a305bab8452369b1f Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Mon, 10 Jul 2017 11:51:37 -0400 Subject: Remove support for decoding to kIndex_8 Fix up callsites, and remove tests that no longer make sense. Bug: skia:6828 Change-Id: I2548c4b7528b7b1be7412563156f27b52c9d4295 Reviewed-on: https://skia-review.googlesource.com/21664 Reviewed-by: Derek Sollenberger Commit-Queue: Leon Scroggins --- third_party/gif/SkGifImageReader.cpp | 2 -- third_party/gif/SkGifImageReader.h | 8 ++------ 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'third_party/gif') diff --git a/third_party/gif/SkGifImageReader.cpp b/third_party/gif/SkGifImageReader.cpp index 76f3edcef0..e76028dac9 100644 --- a/third_party/gif/SkGifImageReader.cpp +++ b/third_party/gif/SkGifImageReader.cpp @@ -762,13 +762,11 @@ bool SkGifImageReader::parse(SkGifImageReader::SkGIFParseQuery query) isLocalColormapDefined, numColors)) { m_firstFrameHasAlpha = true; - m_firstFrameSupportsIndex8 = true; } else { const bool frameIsSubset = xOffset > 0 || yOffset > 0 || width < fScreenWidth || height < fScreenHeight; m_firstFrameHasAlpha = frameIsSubset; - m_firstFrameSupportsIndex8 = !frameIsSubset; } } diff --git a/third_party/gif/SkGifImageReader.h b/third_party/gif/SkGifImageReader.h index f105a1de87..49655c23df 100644 --- a/third_party/gif/SkGifImageReader.h +++ b/third_party/gif/SkGifImageReader.h @@ -289,7 +289,6 @@ public: , m_streamBuffer(stream) , m_parseCompleted(false) , m_firstFrameHasAlpha(false) - , m_firstFrameSupportsIndex8(false) { } @@ -367,8 +366,6 @@ public: bool firstFrameHasAlpha() const { return m_firstFrameHasAlpha; } - bool firstFrameSupportsIndex8() const { return m_firstFrameSupportsIndex8; } - // Helper function that returns whether an SkGIFFrameContext has transparency. // This method is sometimes called before creating one/parsing its color map, // so it cannot rely on SkGIFFrameContext::transparentPixel or ::localColorMap(). @@ -410,10 +407,9 @@ private: SkStreamBuffer m_streamBuffer; bool m_parseCompleted; - // These values can be computed before we create a SkGIFFrameContext, so we - // store them here instead of on m_frames[0]. + // This value can be computed before we create a SkGIFFrameContext, so we + // store it here instead of on m_frames[0]. bool m_firstFrameHasAlpha; - bool m_firstFrameSupportsIndex8; }; #endif -- cgit v1.2.3