Change SkImageDecoders to take an SkStreamRewindable.

src/ports/SkImageDecoder_WIC.cpp

Index: src/ports/SkImageDecoder_WIC.cpp
diff --git a/src/ports/SkImageDecoder_WIC.cpp b/src/ports/SkImageDecoder_WIC.cpp
index 77f4b952763764cd97383df59f03e9e29ba83401..14d313d2ea1afd7ea48dd795b0ad86e2e87e2c53 100644
--- a/src/ports/SkImageDecoder_WIC.cpp
+++ b/src/ports/SkImageDecoder_WIC.cpp
@@ -39,17 +39,18 @@ public:
     };
 
     /**
-     *  Helper function to decode an SkStream.
-     *  @param stream SkStream to decode. Must be at the beginning.
+     *  Helper function to decode an SkStreamRewindable.
+     *  @param stream SkStreamRewindable to decode. Must be at the beginning.
      *  @param bm   SkBitmap to decode into. Only used if wicMode is kDecodeBounds_WICMode or
      *      kDecodePixels_WICMode, in which case it must not be NULL.
-     *  @param format Out parameter for the SkImageDecoder::Format of the SkStream. Only used if
-     *      wicMode is kDecodeFormat_WICMode.
+     *  @param format Out parameter for the SkImageDecoder::Format of the SkStreamRewindable.
+     *      Only used if wicMode is kDecodeFormat_WICMode.
      */
-    bool decodeStream(SkStream* stream, SkBitmap* bm, WICModes wicMode, Format* format) const;
+    bool decodeStream(SkStreamRewindable* stream, SkBitmap* bm, WICModes wicMode,
+                      Format* format) const;
 
 protected:
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode mode) SK_OVERRIDE;
+    virtual bool onDecode(SkStreamRewindable* stream, SkBitmap* bm, Mode mode) SK_OVERRIDE;
 };
 
 struct FormatConversion {
@@ -74,7 +75,7 @@ static SkImageDecoder::Format GuidContainerFormat_to_Format(REFGUID guid) {
     return SkImageDecoder::kUnknown_Format;
 }
 
-bool SkImageDecoder_WIC::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
+bool SkImageDecoder_WIC::onDecode(SkStreamRewindable* stream, SkBitmap* bm, Mode mode) {
     WICModes wicMode;
     switch (mode) {
         case SkImageDecoder::kDecodeBounds_Mode:
@@ -87,7 +88,7 @@ bool SkImageDecoder_WIC::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     return this->decodeStream(stream, bm, wicMode, NULL);
 }
 
-bool SkImageDecoder_WIC::decodeStream(SkStream* stream, SkBitmap* bm, WICModes wicMode,
+bool SkImageDecoder_WIC::decodeStream(SkStreamRewindable* stream, SkBitmap* bm, WICModes wicMode,
                                       Format* format) const {
     //Initialize COM.
     SkAutoCoInitialize scopedCo;
@@ -108,7 +109,7 @@ bool SkImageDecoder_WIC::decodeStream(SkStream* stream, SkBitmap* bm, WICModes w
         );
     }
 
-    //Convert SkStream to IStream.
+    //Convert SkStreamRewindable to IStream.
     SkTScopedComPtr<IStream> piStream;
     if (SUCCEEDED(hr)) {
         hr = SkIStream::CreateFromSkStream(stream, false, &piStream);
@@ -230,9 +231,9 @@ bool SkImageDecoder_WIC::decodeStream(SkStream* stream, SkBitmap* bm, WICModes w
 
 /////////////////////////////////////////////////////////////////////////
 
-extern SkImageDecoder* image_decoder_from_stream(SkStream*);
+extern SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*);
 
-SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
+SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) {
     SkImageDecoder* decoder = image_decoder_from_stream(stream);
     if (NULL == decoder) {
         // If no image decoder specific to the stream exists, use SkImageDecoder_WIC.
@@ -244,7 +245,7 @@ SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
 
 /////////////////////////////////////////////////////////////////////////
 
-SkMovie* SkMovie::DecodeStream(SkStream* stream) {
+SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) {
     return NULL;
 }
 
@@ -434,7 +435,7 @@ static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) {
 
 static SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> gEReg(sk_imageencoder_wic_factory);
 
-static SkImageDecoder::Format get_format_wic(SkStream* stream) {
+static SkImageDecoder::Format get_format_wic(SkStreamRewindable* stream) {
     SkImageDecoder::Format format;
     SkImageDecoder_WIC codec;
     if (!codec.decodeStream(stream, NULL, SkImageDecoder_WIC::kDecodeFormat_WICMode, &format)) {
@@ -443,4 +444,4 @@ static SkImageDecoder::Format get_format_wic(SkStream* stream) {
     return format;
 }
 
-static SkTRegistry<SkImageDecoder::Format, SkStream*> gFormatReg(get_format_wic);
+static SkTRegistry<SkImageDecoder::Format, SkStreamRewindable*> gFormatReg(get_format_wic);