Revert "Revert "Revert of https://codereview.chromium.org/110593003/""

include/core/SkMallocPixelRef.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 SkMallocPixelRef_DEFINED
@@ skipping 14 matching lines @@
      *
      *  The pixelref will ref() the colortable (if not NULL).
      *
      *  Returns NULL on failure.
      */
     static SkMallocPixelRef* NewDirect(const SkImageInfo&, void* addr,
                                        size_t rowBytes, SkColorTable*);
 
     /**
      *  Return a new SkMallocPixelRef, automatically allocating storage for the
-     *  pixels. If rowBytes are 0, an optimal value will be chosen automatically.
-     *  If rowBytes is > 0, then it will be respected, or NULL will be returned
-     *  if rowBytes is invalid for the specified info.
+     *  pixels.
+     *
+     *  If rowBytes is 0, an optimal value will be chosen automatically.
+     *  If rowBytes is > 0, then it will be used, unless it is invald for the
+     *  specified info, in which case NULL will be returned (failure).
      *
      *  This pixelref will ref() the specified colortable (if not NULL).
      *
      *  Returns NULL on failure.
      */
     static SkMallocPixelRef* NewAllocate(const SkImageInfo& info,
                                          size_t rowBytes, SkColorTable*);
 
     /**
      *  Return a new SkMallocPixelRef with the provided pixel storage,
@@ skipping 33 matching lines @@
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMallocPixelRef)
 
 protected:
     // The ownPixels version of this constructor is deprecated.
     SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, SkColorTable*,
                      bool ownPixels);
     SkMallocPixelRef(SkFlattenableReadBuffer& buffer);
     virtual ~SkMallocPixelRef();
 
-    virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
+    virtual void* onLockPixels(SkColorTable**) SK_OVERRIDE;
     virtual void onUnlockPixels() SK_OVERRIDE;
     virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
     virtual size_t getAllocatedSizeInBytes() const SK_OVERRIDE;
 
 private:
     void*           fStorage;
     SkColorTable*   fCTable;
     size_t          fRB;
     ReleaseProc     fReleaseProc;
     void*           fReleaseProcContext;
 
     SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, SkColorTable*,
                      ReleaseProc proc, void* context);
 
     typedef SkPixelRef INHERITED;
 };
 
 
 #endif