Change SkImageDecoders to take an SkStreamRewindable.

src/images/SkMovie_gif.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkMovie.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
 #include "SkUtils.h"
 
 #include "gif_lib.h"
 
 class SkGIFMovie : public SkMovie {
 public:
-    SkGIFMovie(SkStream* stream);
+    SkGIFMovie(SkStreamRewindable* stream);
     virtual ~SkGIFMovie();
 
 protected:
     virtual bool onGetInfo(Info*);
     virtual bool onSetTime(SkMSec);
     virtual bool onGetBitmap(SkBitmap*);
 
 private:
     GifFileType* fGIF;
     int fCurrIndex;
     int fLastDrawIndex;
     SkBitmap fBackup;
 };
 
 static int Decode(GifFileType* fileType, GifByteType* out, int size) {
-    SkStream* stream = (SkStream*) fileType->UserData;
+    SkStreamRewindable* stream = (SkStreamRewindable*) fileType->UserData;
     return (int) stream->read(out, size);
 }
 
-SkGIFMovie::SkGIFMovie(SkStream* stream)
+SkGIFMovie::SkGIFMovie(SkStreamRewindable* stream)
 {
 #if GIFLIB_MAJOR < 5
     fGIF = DGifOpen( stream, Decode );
 #else
     fGIF = DGifOpen( stream, Decode, NULL );
 #endif
     if (NULL == fGIF)
         return;
 
     if (DGifSlurp(fGIF) != GIF_OK)
@@ skipping 373 matching lines @@
 
     // save index
     fLastDrawIndex = lastIndex;
     return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkTRegistry.h"
 
-SkMovie* Factory(SkStream* stream) {
+SkMovie* Factory(SkStreamRewindable* stream) {
     char buf[GIF_STAMP_LEN];
     if (stream->read(buf, GIF_STAMP_LEN) == GIF_STAMP_LEN) {
         if (memcmp(GIF_STAMP,   buf, GIF_STAMP_LEN) == 0 ||
                 memcmp(GIF87_STAMP, buf, GIF_STAMP_LEN) == 0 ||
                 memcmp(GIF89_STAMP, buf, GIF_STAMP_LEN) == 0) {
             // must rewind here, since our construct wants to re-read the data
             stream->rewind();
             return SkNEW_ARGS(SkGIFMovie, (stream));
         }
     }
     return NULL;
 }
 
-static SkTRegistry<SkMovie*, SkStream*> gReg(Factory);
+static SkTRegistry<SkMovie*, SkStreamRewindable*> gReg(Factory);