Revert "Revert "PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is…

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(SkStreamRewindable* stream,
-                                             SkBitmap::Config config,
-                                             int sampleSize)
-        : SkImageRef(stream, config, sampleSize) {
+SkImageRef_ashmem::SkImageRef_ashmem(const SkImageInfo& info,
+                                     SkStreamRewindable* stream,
+                                     int sampleSize)
+        : SkImageRef(info, stream, sampleSize) {
 
     fRec.fFD = -1;
     fRec.fAddr = NULL;
     fRec.fSize = 0;
     fRec.fPinned = false;
 
     fCT = NULL;
 }
 
 SkImageRef_ashmem::~SkImageRef_ashmem() {
@@ skipping 176 matching lines @@
     fRec.fFD = -1;
     fRec.fAddr = NULL;
     fRec.fSize = 0;
     fRec.fPinned = false;
     fCT = NULL;
 
     SkString uri;
     buffer.readString(&uri);
     this->setURI(uri);
 }