Index: include/core/SkMallocPixelRef.h |
diff --git a/include/core/SkMallocPixelRef.h b/include/core/SkMallocPixelRef.h |
index c40afc433aca6a403e7ed1b25af65148172c6e90..272dc21fd872e34c4a98ac4d0530ac6751f56137 100644 |
--- a/include/core/SkMallocPixelRef.h |
+++ b/include/core/SkMallocPixelRef.h |
@@ -32,9 +32,11 @@ |
/** |
* 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). |
* |
@@ -88,7 +90,7 @@ |
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; |