Change SkImageDecoders to take an SkStreamRewindable.

src/ports/SkImageDecoder_empty.cpp

Index: src/ports/SkImageDecoder_empty.cpp
diff --git a/src/ports/SkImageDecoder_empty.cpp b/src/ports/SkImageDecoder_empty.cpp
index c225bb1998dce6c2063fc7a63795a8bc2860309a..77c3e31267cac228396f3197efe554806f7449c5 100644
--- a/src/ports/SkImageDecoder_empty.cpp
+++ b/src/ports/SkImageDecoder_empty.cpp
@@ -14,11 +14,11 @@
 #include "SkMovie.h"
 
 class SkColorTable;
-class SkStream;
+class SkStreamRewindable;
 
 // Empty implementations for SkImageDecoder.
 
-SkImageDecoder* SkImageDecoder::Factory(SkStream*) {
+SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable*) {
     return NULL;
 }
 
@@ -29,11 +29,11 @@ bool SkImageDecoder::DecodeFile(const char[], SkBitmap*, SkBitmap::Config,
     return false;
 }
 
-bool SkImageDecoder::decode(SkStream*, SkBitmap*, SkBitmap::Config, Mode) {
+bool SkImageDecoder::decode(SkStreamRewindable*, SkBitmap*, SkBitmap::Config, Mode) {
     return false;
 }
 
-bool SkImageDecoder::DecodeStream(SkStream*, SkBitmap*, SkBitmap::Config,
+bool SkImageDecoder::DecodeStream(SkStreamRewindable*, SkBitmap*, SkBitmap::Config,
                                   SkImageDecoder::Mode,
                                   SkImageDecoder::Format*) {
     return false;
@@ -45,7 +45,7 @@ bool SkImageDecoder::DecodeMemory(const void*, size_t, SkBitmap*,
     return false;
 }
 
-bool SkImageDecoder::buildTileIndex(SkStream*, int *width, int *height) {
+bool SkImageDecoder::buildTileIndex(SkStreamRewindable*, int *width, int *height) {
     return false;
 }
 
@@ -57,7 +57,7 @@ SkImageDecoder::Format SkImageDecoder::getFormat() const {
     return kUnknown_Format;
 }
 
-SkImageDecoder::Format SkImageDecoder::GetStreamFormat(SkStream*) {
+SkImageDecoder::Format SkImageDecoder::GetStreamFormat(SkStreamRewindable*) {
     return kUnknown_Format;
 }
 
@@ -112,7 +112,7 @@ SkBitmap::Config SkImageDecoder::getPrefConfig(SrcDepth, bool) const {
 
 // Empty implementation for SkMovie.
 
-SkMovie* SkMovie::DecodeStream(SkStream* stream) {
+SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) {
     return NULL;
 }