Revert[4] of add asserts around results from requestLock

include/core/SkPixelRef.h

 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPixelRef_DEFINED
 #define SkPixelRef_DEFINED
 
@@ skipping 57 matching lines @@
     */
     SkColorTable* colorTable() const { return fRec.fColorTable; }
 
     size_t rowBytes() const { return fRec.fRowBytes; }
 
     /**
      *  To access the actual pixels of a pixelref, it must be "locked".
      *  Calling lockPixels returns a LockRec struct (on success).
      */
     struct LockRec {
+        LockRec() : fPixels(NULL), fColorTable(NULL) {}
+
         void*           fPixels;
         SkColorTable*   fColorTable;
         size_t          fRowBytes;
 
         void zero() { sk_bzero(this, sizeof(*this)); }
 
         bool isZero() const {
             return NULL == fPixels && NULL == fColorTable && 0 == fRowBytes;
         }
     };
@@ skipping 104 matching lines @@
     SkData* refEncodedData() {
         return this->onRefEncodedData();
     }
 
     struct LockRequest {
         SkISize         fSize;
         SkFilterQuality fQuality;
     };
 
     struct LockResult {
+        LockResult() : fPixels(NULL), fCTable(NULL) {}
+
         void        (*fUnlockProc)(void* ctx);
         void*       fUnlockContext;
 
+        const void* fPixels;
         SkColorTable* fCTable;  // should be NULL unless colortype is kIndex8
-        const void* fPixels;
         size_t      fRowBytes;
         SkISize     fSize;
 
         void unlock() {
             if (fUnlockProc) {
                 fUnlockProc(fUnlockContext);
                 fUnlockProc = NULL; // can't unlock twice!
             }
         }
     };
@@ skipping 121 matching lines @@
 private:
     SkBaseMutex*    fMutex; // must remain in scope for the life of this object
 
     // mostly const. fInfo.fAlpahType can be changed at runtime.
     const SkImageInfo fInfo;
 
     // LockRec is only valid if we're in a locked state (isLocked())
     LockRec         fRec;
     int             fLockCount;
 
-    bool lockPixelsInsideMutex(LockRec* rec);
+    bool lockPixelsInsideMutex();
 
     // Bottom bit indicates the Gen ID is unique.
     bool genIDIsUnique() const { return SkToBool(fTaggedGenID.load() & 1); }
     mutable SkAtomic<uint32_t> fTaggedGenID;
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     const uint32_t fStableID;
 #endif
 
     SkTDArray<GenIDChangeListener*> fGenIDChangeListeners;  // pointers are owned
@@ skipping 25 matching lines @@
     /**
      *  Allocate a new pixelref matching the specified ImageInfo, allocating
      *  the memory for the pixels. If the ImageInfo requires a ColorTable,
      *  the pixelref will ref() the colortable.
      *  On failure return NULL.
      */
     virtual SkPixelRef* create(const SkImageInfo&, size_t rowBytes, SkColorTable*) = 0;
 };
 
 #endif