Adding size parameter to read array functions

src/core/SkOrderedReadBuffer.cpp

Index: src/core/SkOrderedReadBuffer.cpp
diff --git a/src/core/SkOrderedReadBuffer.cpp b/src/core/SkOrderedReadBuffer.cpp
index d9aa8bd1d751d35c722bb05d79ddd291d0225461..1e5817f704da708e174741390855a89bd05445df 100644
--- a/src/core/SkOrderedReadBuffer.cpp
+++ b/src/core/SkOrderedReadBuffer.cpp
@@ -137,38 +137,37 @@ void SkOrderedReadBuffer::readPath(SkPath* path) {
     fReader.readPath(path);
 }
 
-uint32_t SkOrderedReadBuffer::readByteArray(void* value) {
-    const uint32_t length = fReader.readU32();
-    memcpy(value, fReader.skip(SkAlign4(length)), length);
-    return length;
+template <typename T> bool SkOrderedReadBuffer::readArray(T* value, size_t size) {

[reed1, 2013/10/30 20:22:32]

if we care about code bloat at all, this can trivially be turned into a
non-template function, and still be shared/efficient... just pass fReader and
sizeof(T) as parameters.

[sugoi1, 2013/10/31 14:16:24]

Done.

+    const uint32_t count = this->getArrayCount();
+    const size_t byteLength = count * sizeof(T);
+    if (byteLength == size) {
+        (void)fReader.skip(sizeof(uint32_t)); // Skip array count
+        memcpy(value, fReader.skip(SkAlign4(byteLength)), byteLength);
+        return true;
+    }
+    SkASSERT(false);
+    fReader.skip(fReader.available());
+    return false;
+}
+
+bool SkOrderedReadBuffer::readByteArray(void* value, size_t size) {
+    return readArray(static_cast<unsigned char*>(value), size);
 }
 
-uint32_t SkOrderedReadBuffer::readColorArray(SkColor* colors) {
-    const uint32_t count = fReader.readU32();
-    const uint32_t byteLength = count * sizeof(SkColor);
-    memcpy(colors, fReader.skip(SkAlign4(byteLength)), byteLength);
-    return count;
+bool SkOrderedReadBuffer::readColorArray(SkColor* colors, size_t size) {
+    return readArray(colors, size);
 }
 
-uint32_t SkOrderedReadBuffer::readIntArray(int32_t* values) {
-    const uint32_t count = fReader.readU32();
-    const uint32_t byteLength = count * sizeof(int32_t);
-    memcpy(values, fReader.skip(SkAlign4(byteLength)), byteLength);
-    return count;
+bool SkOrderedReadBuffer::readIntArray(int32_t* values, size_t size) {
+    return readArray(values, size);
 }
 
-uint32_t SkOrderedReadBuffer::readPointArray(SkPoint* points) {
-    const uint32_t count = fReader.readU32();
-    const uint32_t byteLength = count * sizeof(SkPoint);
-    memcpy(points, fReader.skip(SkAlign4(byteLength)), byteLength);
-    return count;
+bool SkOrderedReadBuffer::readPointArray(SkPoint* points, size_t size) {
+    return readArray(points, size);
 }
 
-uint32_t SkOrderedReadBuffer::readScalarArray(SkScalar* values) {
-    const uint32_t count = fReader.readU32();
-    const uint32_t byteLength = count * sizeof(SkScalar);
-    memcpy(values, fReader.skip(SkAlign4(byteLength)), byteLength);
-    return count;
+bool SkOrderedReadBuffer::readScalarArray(SkScalar* values, size_t size) {
+    return readArray(values, size);
 }
 
 uint32_t SkOrderedReadBuffer::getArrayCount() {