Revert of remvoe duplicate impl for SkImageInfo flattening

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(const SkImageInfo& info, SkStreamRewindable* stream,
+SkImageRef::SkImageRef(SkStreamRewindable* stream, SkBitmap::Config config,
                        int sampleSize, SkBaseMutex* mutex)
-        : INHERITED(info, mutex), fErrorInDecoding(false) {
+        : SkPixelRef(mutex), fErrorInDecoding(false) {
     SkASSERT(stream);
     stream->ref();
     fStream = stream;
+    fConfig = config;
     fSampleSize = sampleSize;
     fDoDither = true;
     fPrev = fNext = NULL;
     fFactory = NULL;
 
 #ifdef DUMP_IMAGEREF_LIFECYCLE
     SkDebugf("add ImageRef %p [%d] data=%d\n",
               this, config, (int)stream->getLength());
 #endif
 }
 
 SkImageRef::~SkImageRef() {
 
 #ifdef DUMP_IMAGEREF_LIFECYCLE
     SkDebugf("delete ImageRef %p [%d] data=%d\n",
-              this, this->info().fColorType, (int)fStream->getLength());
+              this, fConfig, (int)fStream->getLength());
 #endif
 
     fStream->unref();
     SkSafeUnref(fFactory);
 }
 
 bool SkImageRef::getInfo(SkBitmap* bitmap) {
     SkAutoMutexAcquire ac(this->mutex());
 
     if (!this->prepareBitmap(SkImageDecoder::kDecodeBounds_Mode)) {
@@ skipping 31 matching lines @@
                           SkImageDecoder::Mode mode) {
     return codec->decode(stream, bitmap, config, mode);
 }
 
 bool SkImageRef::prepareBitmap(SkImageDecoder::Mode mode) {
 
     if (fErrorInDecoding) {
         return false;
     }
 
+    /*  As soon as we really know our config, we record it, so that on
+        subsequent calls to the codec, we are sure we will always get the same
+        result.
+    */
+    if (SkBitmap::kNo_Config != fBitmap.config()) {
+        fConfig = fBitmap.config();
+    }
+
     if (NULL != fBitmap.getPixels() ||
             (SkBitmap::kNo_Config != fBitmap.config() &&
              SkImageDecoder::kDecodeBounds_Mode == mode)) {
         return true;
     }
 
     SkASSERT(fBitmap.getPixels() == NULL);
 
     if (!fStream->rewind()) {
         SkDEBUGF(("Failed to rewind SkImageRef stream!"));
         return false;
     }
 
     SkImageDecoder* codec;
     if (fFactory) {
         codec = fFactory->newDecoder(fStream);
     } else {
         codec = SkImageDecoder::Factory(fStream);
     }
 
     if (codec) {
         SkAutoTDelete<SkImageDecoder> ad(codec);
 
         codec->setSampleSize(fSampleSize);
         codec->setDitherImage(fDoDither);
-        if (this->onDecode(codec, fStream, &fBitmap, fBitmap.config(), mode)) {
+        if (this->onDecode(codec, fStream, &fBitmap, fConfig, mode)) {
             return true;
         }
     }
 
 #ifdef DUMP_IMAGEREF_LIFECYCLE
     if (NULL == codec) {
         SkDebugf("--- ImageRef: <%s> failed to find codec\n", this->getURI());
     } else {
         SkDebugf("--- ImageRef: <%s> failed in codec for %d mode\n",
                  this->getURI(), mode);
     }
 #endif
     fErrorInDecoding = true;
     fBitmap.reset();
     return false;
 }
 
-bool SkImageRef::onNewLockPixels(LockRec* rec) {
+void* SkImageRef::onLockPixels(SkColorTable** ct) {
     if (NULL == fBitmap.getPixels()) {
         (void)this->prepareBitmap(SkImageDecoder::kDecodePixels_Mode);
     }
 
-    if (NULL == fBitmap.getPixels()) {
-        return false;
+    if (ct) {
+        *ct = fBitmap.getColorTable();
     }
-    rec->fPixels = fBitmap.getPixels();
-    rec->fColorTable = NULL;
-    rec->fRowBytes = fBitmap.rowBytes();
-    return true;
+    return fBitmap.getPixels();
 }
 
 size_t SkImageRef::ramUsed() const {
     size_t size = 0;
 
     if (fBitmap.getPixels()) {
         size = fBitmap.getSize();
         if (fBitmap.getColorTable()) {
             size += fBitmap.getColorTable()->count() * sizeof(SkPMColor);
         }
     }
     return size;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkImageRef::SkImageRef(SkFlattenableReadBuffer& buffer, SkBaseMutex* mutex)
         : INHERITED(buffer, mutex), fErrorInDecoding(false) {
+    fConfig = (SkBitmap::Config)buffer.readUInt();
     fSampleSize = buffer.readInt();
     fDoDither = buffer.readBool();
 
     size_t length = buffer.getArrayCount();
     fStream = SkNEW_ARGS(SkMemoryStream, (length));
     buffer.readByteArray((void*)fStream->getMemoryBase(), length);
 
     fPrev = fNext = NULL;
     fFactory = NULL;
 }
 
 void SkImageRef::flatten(SkFlattenableWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
 
+    buffer.writeUInt(fConfig);
     buffer.writeInt(fSampleSize);
     buffer.writeBool(fDoDither);
     // FIXME: Consider moving this logic should go into writeStream itself.
     // writeStream currently has no other callers, so this may be fine for
     // 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());
     }
 }