Change SkImageDecoders to take an SkStreamRewindable.

src/images/SkImageRef_ashmem.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_ashmem.h"
 #include "SkImageDecoder.h"
 #include "SkFlattenableBuffers.h"
@@ skipping 13 matching lines @@
 #endif
 
 // ashmem likes lengths on page boundaries
 static size_t roundToPageSize(size_t size) {
     const size_t mask = getpagesize() - 1;
     size_t newsize = (size + mask) & ~mask;
 //    SkDebugf("---- oldsize %d newsize %d\n", size, newsize);
     return newsize;
 }
 
-SkImageRef_ashmem::SkImageRef_ashmem(SkStream* stream,
+SkImageRef_ashmem::SkImageRef_ashmem(SkStreamRewindable* stream,
                                              SkBitmap::Config config,
                                              int sampleSize)
         : SkImageRef(stream, config, sampleSize) {
 
     fRec.fFD = -1;
     fRec.fAddr = NULL;
     fRec.fSize = 0;
     fRec.fPinned = false;
 
     fCT = NULL;
@@ skipping 74 matching lines @@
         fRec->fPinned = true;
         return true;
     }
 
 private:
     // we just point to our caller's memory, these are not copies
     SkAshmemRec* fRec;
     const char*  fName;
 };
 
-bool SkImageRef_ashmem::onDecode(SkImageDecoder* codec, SkStream* stream,
+bool SkImageRef_ashmem::onDecode(SkImageDecoder* codec, SkStreamRewindable* stream,
                                  SkBitmap* bitmap, SkBitmap::Config config,
                                  SkImageDecoder::Mode mode) {
 
     if (SkImageDecoder::kDecodeBounds_Mode == mode) {
         return this->INHERITED::onDecode(codec, stream, bitmap, config, mode);
     }
 
     AshmemAllocator alloc(&fRec, this->getURI());
 
     codec->setAllocator(&alloc);
@@ skipping 81 matching lines @@
     fRec.fFD = -1;
     fRec.fAddr = NULL;
     fRec.fSize = 0;
     fRec.fPinned = false;
     fCT = NULL;
 
     SkString uri;
     buffer.readString(&uri);
     this->setURI(uri);
 }