Roll out r27896 as it caused lots of build breakages.
[WebKit-https.git] / WebCore / platform / image-decoders / gif / GIFImageDecoder.h
index e2fc76717fa802895dbc6fdb8af5877cbe0b22cc..60d63e67b56879d5b501ca29ea9fff441af8c281 100644 (file)
@@ -65,20 +65,18 @@ public:
     void decodingHalted(unsigned bytesLeft);
     void haveDecodedRow(unsigned frameIndex, unsigned char* rowBuffer, unsigned char* rowEnd, unsigned rowNumber, 
                         unsigned repeatCount);
-    void frameComplete(unsigned frameIndex, unsigned frameDuration, RGBA32Buffer::FrameDisposalMethod disposalMethod);
+    void frameComplete(unsigned frameIndex, unsigned frameDuration, bool includeInNextFrame);
     void gifComplete();
 
 private:
-    // Called to initialize the frame buffer with the given index, based on the
-    // previous frame's disposal method.
-    void initFrameBuffer(unsigned frameIndex);
-
-    // A helper for initFrameBuffer(), this sets the size of the buffer, and
-    // fills it with transparent pixels.
-    void prepEmptyFrameBuffer(RGBA32Buffer* buffer) const;
+    // Called to initialize a new frame buffer (potentially compositing it
+    // with the previous frame and/or clearing bits in our image based off
+    // the previous frame as well).
+    void initFrameBuffer(RGBA32Buffer& buffer,
+                         RGBA32Buffer* previousBuffer,
+                         bool compositeWithPreviousFrame);
 
     bool m_frameCountValid;
-    bool m_currentBufferSawAlpha;
     mutable GIFImageDecoderPrivate* m_reader;
 };