Adding size parameter to read array functions

include/core/SkFlattenableBuffers.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFlattenableBuffers_DEFINED
 #define SkFlattenableBuffers_DEFINED
@@ skipping 81 matching lines @@
 
     // common data structures
     virtual void readPoint(SkPoint* point) = 0;
     virtual void readMatrix(SkMatrix* matrix) = 0;
     virtual void readIRect(SkIRect* rect) = 0;
     virtual void readRect(SkRect* rect) = 0;
     virtual void readRegion(SkRegion* region) = 0;
     virtual void readPath(SkPath* path) = 0;
 
     // binary data and arrays
-    virtual uint32_t readByteArray(void* value) = 0;
-    virtual uint32_t readColorArray(SkColor* colors) = 0;
-    virtual uint32_t readIntArray(int32_t* values) = 0;
-    virtual uint32_t readPointArray(SkPoint* points) = 0;
-    virtual uint32_t readScalarArray(SkScalar* values) = 0;
+
+    /**
+      * In the following read.*Array(...) functions, the size parameter specifies the allocation
+      * size (in bytes) of the pointer parameter. In the case where isValidating() is true, then
+      * if the pointer parameter's size does not match the size to be read, the pointer
+      * parameter's memory will then stay uninitialized, the cursor will not move, the function
+      * will return 0 and an error flag will be set internally (see SkValidatingReadBuffer).
+      * If the sizes match, then the amount of memory actually read will be returned.
+      * If isValidating() is false, then the size parameter is used as the maximum amount of memory

[reed1, 2013/10/30 14:50:30]

It seems like we're saying the following:

if we're validating
    - size must be == actual size
    - we return 0 or size

if we're not validating
    - size can be anything
    - we return 0 or min(size, actual_size)

Can we unify these, so the behaviors (modulo setting the error field perhaps)
are the same?
    1. can we always require == sizes?
    2. if so, should this guy just return a bool?

[sugoi1, 2013/10/30 17:43:51]

Done.

+      * that can be read and at most this much memory will be read.
+      */
+    virtual size_t readByteArray(void* value, size_t size) = 0;
+    virtual size_t readColorArray(SkColor* colors, size_t size) = 0;
+    virtual size_t readIntArray(int32_t* values, size_t size) = 0;
+    virtual size_t readPointArray(SkPoint* points, size_t size) = 0;
+    virtual size_t readScalarArray(SkScalar* values, size_t size) = 0;
 
     /** This helper peeks into the buffer and reports back the length of the next array in
      *  the buffer but does not change the state of the buffer.
      */
     virtual uint32_t getArrayCount() = 0;
 
     // helper functions
     virtual void* readFunctionPtr();
     virtual void readPaint(SkPaint* paint);
 
     virtual void readBitmap(SkBitmap* bitmap) = 0;
     virtual SkTypeface* readTypeface() = 0;
 
     // helper function for classes with const SkPoint members
     SkPoint readPoint() {
         SkPoint point;
         this->readPoint(&point);
         return point;
     }
 
     SkData* readByteArrayAsData() {
         size_t len = this->getArrayCount();
         void* buffer = sk_malloc_throw(len);
-        (void)this->readByteArray(buffer);
+        (void)this->readByteArray(buffer, len);
         return SkData::NewFromMalloc(buffer, len);
     }
 
     virtual void validate(bool isValid) {}
 
 private:
     template <typename T> T* readFlattenableT();
     uint32_t fFlags;
 };
 
@@ skipping 70 matching lines @@
     }
 
 protected:
     // A helper function so that each subclass does not have to be a friend of SkFlattenable
     void flattenObject(const SkFlattenable* obj, SkFlattenableWriteBuffer& buffer);
 
     uint32_t fFlags;
 };
 
 #endif