1 files changed, 6 insertions, 5 deletions
diff --git a/chromium/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.h b/chromium/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.h
index 91710475f38..2aa48c6a090 100644
--- a/chromium/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.h
+++ b/chromium/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.h
@@ -52,14 +52,16 @@ public:
     static bool isLazyDecoded(const SkBitmap&);
 
     static void setEnabled(bool);
+    static bool enabled();
 
     String filenameExtension() const;
 
     ImageFrame* frameBufferAtIndex(size_t index);
 
-    void setData(SharedBuffer* data, bool allDataReceived);
+    void setData(SharedBuffer& data, bool allDataReceived);
 
     bool isSizeAvailable();
+    bool hasColorProfile() const;
     IntSize size() const;
     IntSize frameSizeAtIndex(size_t index) const;
     size_t frameCount();
@@ -79,25 +81,24 @@ private:
     explicit DeferredImageDecoder(PassOwnPtr<ImageDecoder> actualDecoder);
     void prepareLazyDecodedFrames();
     SkBitmap createBitmap(size_t index);
-    SkBitmap createSkiaDiscardableBitmap(size_t index);
-    SkBitmap createLazyDecodingBitmap(size_t index);
     void activateLazyDecoding();
-    void setData(PassRefPtr<SharedBuffer>, bool allDataReceived);
 
     RefPtr<SharedBuffer> m_data;
     bool m_allDataReceived;
+    unsigned m_lastDataSize;
+    bool m_dataChanged;
     OwnPtr<ImageDecoder> m_actualDecoder;
 
     String m_filenameExtension;
     IntSize m_size;
     ImageOrientation m_orientation;
     int m_repetitionCount;
+    bool m_hasColorProfile;
 
     Vector<OwnPtr<ImageFrame> > m_lazyDecodedFrames;
     RefPtr<ImageFrameGenerator> m_frameGenerator;
 
     static bool s_enabled;
-    static bool s_skiaDiscardableMemoryEnabled;
 };
 
 } // namespace WebCore