change internals over to SkPixmap and stop using accessBitmap

src/core/SkPixmap.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkConfig8888.h"
 #include "SkPixmap.h"
 
 void SkAutoPixmapUnlock::reset(const SkPixmap& pm, void (*unlock)(void*), void* ctx) {
     SkASSERT(pm.addr() != NULL);
 
     this->unlock();
     fPixmap = pm;
     fUnlockProc = unlock;
     fUnlockContext = ctx;
     fIsLocked = true;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
+void SkPixmap::reset() {
+    fPixels = NULL;
+    fCTable = NULL;
+    fRowBytes = 0;
+    fInfo = SkImageInfo::MakeUnknown();
+}
+
+void SkPixmap::reset(const SkImageInfo& info, const void* addr, size_t rowBytes, SkColorTable* ct) {
+    if (addr) {

[scroggo, 2015/05/26 18:30:31]

It seems like if addr is NULL, the rest of these aren't meaningful. Should we
just reset() it in that case? Or is there a valid case I am missing?

[reed1, 2015/05/26 18:45:24]

Yea, still "evolving" what I think we should enforce about the validity of the
fields. SkImageInfo tries to keep self-consistent to some degree, so perhaps we
should add some of that here as well (which may mean removing the constructor
and using a factory instead, so it can "clean things up" before creating the
instance).

+        SkASSERT(info.validRowBytes(rowBytes));
+    }
+    fPixels = addr;
+    fCTable = ct;
+    fRowBytes = rowBytes;
+    fInfo = info;
+}
+
 bool SkPixmap::readPixels(const SkImageInfo& requestedDstInfo, void* dstPixels, size_t dstRB,
                           int x, int y) const {
     if (kUnknown_SkColorType == requestedDstInfo.colorType()) {
         return false;
     }
     if (NULL == dstPixels || dstRB < requestedDstInfo.minRowBytes()) {
         return false;
     }
     if (0 == requestedDstInfo.width() || 0 == requestedDstInfo.height()) {
         return false;
@@ skipping 15 matching lines @@
         y = 0;
     }
     // here x,y are either 0 or negative
     dstPixels = ((char*)dstPixels - y * dstRB - x * dstInfo.bytesPerPixel());
 
     const SkImageInfo srcInfo = this->info().makeWH(dstInfo.width(), dstInfo.height());
     const void* srcPixels = this->addr(srcR.x(), srcR.y());
     return SkPixelInfo::CopyPixels(dstInfo, dstPixels, dstRB,
                                    srcInfo, srcPixels, this->rowBytes(), this->ctable());
 }