Roll out r27896 as it caused lots of build breakages.

[WebKit-https.git] / WebCore / platform / image-decoders / gif / GIFImageReader.h

diff --git a/WebCore/platform/image-decoders/gif/GIFImageReader.h b/WebCore/platform/image-decoders/gif/GIFImageReader.h
index faa08d27459d1ab16d9c13aadf0ede79ab3e4ef3..c0c543b03907812c13c2de7d72021a59ada0b927 100644 (file)
--- a/WebCore/platform/image-decoders/gif/GIFImageReader.h
+++ b/WebCore/platform/image-decoders/gif/GIFImageReader.h
@@ -76,6 +76,16 @@ typedef enum {
     gif_consume_comment
 } gstate;
 
+/* "Disposal" method indicates how the image should be handled in the
+   framebuffer before the subsequent image is displayed. */
+typedef enum 
+{
+    DISPOSE_NOT_SPECIFIED      = 0,
+    DISPOSE_KEEP               = 1, /* Leave it in the framebuffer */
+    DISPOSE_OVERWRITE_BGCOLOR  = 2, /* Overwrite with background color */
+    DISPOSE_OVERWRITE_PREVIOUS = 3  /* Save-under */
+} gdispose;
+
 struct GIFFrameReader {
     /* LZW decoder state machine */
     unsigned char *stackp;              /* Current stack pointer */
@@ -101,7 +111,7 @@ struct GIFFrameReader {
     unsigned int x_offset, y_offset;    /* With respect to "screen" origin */
     unsigned int height, width;
     int tpixel;                 /* Index of transparent pixel */
-    WebCore::RGBA32Buffer::FrameDisposalMethod disposal_method;   /* Restore to background, leave in place, etc.*/
+    gdispose disposal_method;   /* Restore to background, leave in place, etc.*/
     unsigned char *local_colormap;    /* Per-image colormap */
     int local_colormap_size;    /* Size of local colormap array. */
     
@@ -130,7 +140,7 @@ struct GIFFrameReader {
 
         x_offset = y_offset = width = height = 0;
         tpixel = 0;
-        disposal_method = WebCore::RGBA32Buffer::DisposeNotSpecified;
+        disposal_method = DISPOSE_NOT_SPECIFIED;
 
         local_colormap = 0;
         local_colormap_size = 0;