Revert of Revert[4] of add asserts around results from requestLock

include/core/SkPixelRef.h

Index: include/core/SkPixelRef.h
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h
index 3898269ef458e16440ae09006ceb34fbe199f16f..7c3156ee743339a0c5ec32f3da06eaf278cb95c8 100644
--- a/include/core/SkPixelRef.h
+++ b/include/core/SkPixelRef.h
@@ -75,8 +75,6 @@
      *  Calling lockPixels returns a LockRec struct (on success).
      */
     struct LockRec {
-        LockRec() : fPixels(NULL), fColorTable(NULL) {}
-
         void*           fPixels;
         SkColorTable*   fColorTable;
         size_t          fRowBytes;
@@ -201,13 +199,11 @@
     };
 
     struct LockResult {
-        LockResult() : fPixels(NULL), fCTable(NULL) {}
-
         void        (*fUnlockProc)(void* ctx);
         void*       fUnlockContext;
 
+        SkColorTable* fCTable;  // should be NULL unless colortype is kIndex8
         const void* fPixels;
-        SkColorTable* fCTable;  // should be NULL unless colortype is kIndex8
         size_t      fRowBytes;
         SkISize     fSize;
 
@@ -349,7 +345,7 @@
     LockRec         fRec;
     int             fLockCount;
 
-    bool lockPixelsInsideMutex();
+    bool lockPixelsInsideMutex(LockRec* rec);
 
     // Bottom bit indicates the Gen ID is unique.
     bool genIDIsUnique() const { return SkToBool(fTaggedGenID.load() & 1); }