Rename the existing flatten(void*) methods.

This change avoids naminc confusion with the SkFlattenable flatten methods and
also changes SkPath to use the void* model instead of taking a SkReader32.
Review URL: https://codereview.appspot.com/6299062

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

1 files changed, 3 insertions, 3 deletions

diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index 5eed81eb61..0525f466f7 100644
--- a/samplecode/SampleRegion.cpp
+++ b/samplecode/SampleRegion.cpp
@@ -274,13 +274,13 @@ protected:
             
             {
                 char    buffer[1000];
-                size_t  size = tmp.flatten(NULL);
+                size_t  size = tmp.writeToMemory(NULL);
                 SkASSERT(size <= sizeof(buffer));
-                size_t  size2 = tmp.flatten(buffer);
+                size_t  size2 = tmp.writeToMemory(buffer);
                 SkASSERT(size == size2);
                 
                 SkRegion    tmp3;
-                size2 = tmp3.unflatten(buffer);
+                size2 = tmp3.readFromMemory(buffer);
                 SkASSERT(size == size2);
                 
                 SkASSERT(tmp3 == tmp);