| Index: third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp
|
| index 1db14bf0f6cc4b0e1d6aadb64e4ea8feecf0cf0d..5600cc13cc12c8c73fd6a7088e16eafc53bf2852 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp
|
| @@ -55,8 +55,6 @@ public:
|
| uint32_t m_uniqueID;
|
| };
|
|
|
| -bool DeferredImageDecoder::s_enabled = true;
|
| -
|
| PassOwnPtr<DeferredImageDecoder> DeferredImageDecoder::create(const SharedBuffer& data, ImageDecoder::AlphaOption alphaOption, ImageDecoder::GammaAndColorProfileOption colorOptions)
|
| {
|
| OwnPtr<ImageDecoder> actualDecoder = ImageDecoder::create(data, alphaOption, colorOptions);
|
| @@ -85,16 +83,6 @@ DeferredImageDecoder::~DeferredImageDecoder()
|
| {
|
| }
|
|
|
| -void DeferredImageDecoder::setEnabled(bool enabled)
|
| -{
|
| - s_enabled = enabled;
|
| -}
|
| -
|
| -bool DeferredImageDecoder::enabled()
|
| -{
|
| - return s_enabled;
|
| -}
|
| -
|
| String DeferredImageDecoder::filenameExtension() const
|
| {
|
| return m_actualDecoder ? m_actualDecoder->filenameExtension() : m_filenameExtension;
|
| @@ -259,8 +247,7 @@ void DeferredImageDecoder::activateLazyDecoding()
|
|
|
| void DeferredImageDecoder::prepareLazyDecodedFrames()
|
| {
|
| - if (!s_enabled
|
| - || !m_actualDecoder
|
| + if (!m_actualDecoder
|
| || !m_actualDecoder->isSizeAvailable()
|
| || m_actualDecoder->filenameExtension() == "ico")
|
| return;
|
|
|