Change SkImageDecoders to take an SkStreamRewindable.

src/images/SkImageDecoder_FactoryRegistrar.cpp

Index: src/images/SkImageDecoder_FactoryRegistrar.cpp
diff --git a/src/images/SkImageDecoder_FactoryRegistrar.cpp b/src/images/SkImageDecoder_FactoryRegistrar.cpp
index f1eca3d03afb3b0a1297a4bb262d81c0575fd456..423d459d91fbb77bac865a0ded60451aab5a3a3b 100644
--- a/src/images/SkImageDecoder_FactoryRegistrar.cpp
+++ b/src/images/SkImageDecoder_FactoryRegistrar.cpp
@@ -12,17 +12,17 @@
 
 // This file is used for registration of SkImageDecoders. It also holds a function
 // for checking all the the registered SkImageDecoders for one that matches an
-// input SkStream.
+// input SkStreamRewindable.
 
-typedef SkTRegistry<SkImageDecoder*, SkStream*> DecodeReg;
+typedef SkTRegistry<SkImageDecoder*, SkStreamRewindable*> DecodeReg;
 
 // N.B. You can't use "DecodeReg::gHead here" due to complex C++
 // corner cases.
-template DecodeReg* SkTRegistry<SkImageDecoder*, SkStream*>::gHead;
+template DecodeReg* SkTRegistry<SkImageDecoder*, SkStreamRewindable*>::gHead;
 
-SkImageDecoder* image_decoder_from_stream(SkStream*);
+SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*);
 
-SkImageDecoder* image_decoder_from_stream(SkStream* stream) {
+SkImageDecoder* image_decoder_from_stream(SkStreamRewindable* stream) {
     SkImageDecoder* codec = NULL;
     const DecodeReg* curr = DecodeReg::Head();
     while (curr) {
@@ -47,11 +47,11 @@ SkImageDecoder* image_decoder_from_stream(SkStream* stream) {
     return NULL;
 }
 
-typedef SkTRegistry<SkImageDecoder::Format, SkStream*> FormatReg;
+typedef SkTRegistry<SkImageDecoder::Format, SkStreamRewindable*> FormatReg;
 
-template FormatReg* SkTRegistry<SkImageDecoder::Format, SkStream*>::gHead;
+template FormatReg* SkTRegistry<SkImageDecoder::Format, SkStreamRewindable*>::gHead;
 
-SkImageDecoder::Format SkImageDecoder::GetStreamFormat(SkStream* stream) {
+SkImageDecoder::Format SkImageDecoder::GetStreamFormat(SkStreamRewindable* stream) {
     const FormatReg* curr = FormatReg::Head();
     while (curr != NULL) {
         Format format = curr->factory()(stream);