Revert r12114 due to https://code.google.com/p/skia/issues/detail?id=1794 ('Assertion failures on various buildbots as of r12114')

git-svn-id: http://skia.googlecode.com/svn/trunk@12115 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 5 insertions, 11 deletions

diff --git a/include/core/SkRRect.h b/include/core/SkRRect.h
index 3c6386f1c6..402e6c6c4b 100644
--- a/include/core/SkRRect.h
+++ b/include/core/SkRRect.h
@@ -244,20 +244,14 @@ public:
      *  write kSizeInMemory bytes, and that value is guaranteed to always be
      *  a multiple of 4. Return kSizeInMemory.
      */
-    size_t writeToMemory(void* buffer) const;
+    uint32_t writeToMemory(void* buffer) const;
 
     /**
-     * Reads the rrect from the specified buffer
-     *
-     * If the specified buffer is large enough, this will read kSizeInMemory bytes,
-     * and that value is guaranteed to always be a multiple of 4.
-     *
-     * @param buffer Memory to read from
-     * @param length Amount of memory available in the buffer
-     * @return number of bytes read (must be a multiple of 4) or
-     *         0 if there was not enough memory available
+     *  Read the rrect from the specified buffer. This is guaranteed to always
+     *  read kSizeInMemory bytes, and that value is guaranteed to always be
+     *  a multiple of 4. Return kSizeInMemory.
      */
-    size_t readFromMemory(const void* buffer, size_t length);
+    uint32_t readFromMemory(const void* buffer);
 
 private:
     SkRect fRect;