Change SkImageDecoders to take an SkStreamRewindable.

src/images/SkImageRef.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkImageRef.h"
 #include "SkBitmap.h"
 #include "SkFlattenableBuffers.h"
 #include "SkImageDecoder.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
 #include "SkThread.h"
 
 //#define DUMP_IMAGEREF_LIFECYCLE
 
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkImageRef::SkImageRef(SkStream* stream, SkBitmap::Config config,
+SkImageRef::SkImageRef(SkStreamRewindable* stream, SkBitmap::Config config,
                        int sampleSize, SkBaseMutex* mutex)
         : SkPixelRef(mutex), fErrorInDecoding(false) {
     SkASSERT(stream);
     stream->ref();
     fStream = stream;
     fConfig = config;
     fSampleSize = sampleSize;
     fDoDither = true;
     fPrev = fNext = NULL;
     fFactory = NULL;
@@ skipping 40 matching lines @@
 }
 
 SkImageDecoderFactory* SkImageRef::setDecoderFactory(
                                                 SkImageDecoderFactory* fact) {
     SkRefCnt_SafeAssign(fFactory, fact);
     return fact;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool SkImageRef::onDecode(SkImageDecoder* codec, SkStream* stream,
+bool SkImageRef::onDecode(SkImageDecoder* codec, SkStreamRewindable* stream,
                           SkBitmap* bitmap, SkBitmap::Config config,
                           SkImageDecoder::Mode mode) {
     return codec->decode(stream, bitmap, config, mode);
 }
 
 bool SkImageRef::prepareBitmap(SkImageDecoder::Mode mode) {
 
     if (fErrorInDecoding) {
         return false;
     }
@@ skipping 99 matching lines @@
     // now.
     if (!fStream->rewind()) {
         SkDEBUGF(("Failed to rewind SkImageRef stream!"));
         buffer.write32(0);
     } else {
         // FIXME: Handle getLength properly here. Perhaps this class should
         // take an SkStreamAsset.
         buffer.writeStream(fStream, fStream->getLength());
     }
 }