aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core/SkRegion.h
diff options
context:
space:
mode:
authorGravatar djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-06-08 18:30:46 +0000
committerGravatar djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-06-08 18:30:46 +0000
commit94e75ee46a569cbcdf61fb7f04ee3a69d3ca0896 (patch)
tree69459ed6333c977be86dd36e503593a44a067e94 /include/core/SkRegion.h
parent97caebc7462c202ab0ec5cce4eb26a616930813e (diff)
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
Diffstat (limited to 'include/core/SkRegion.h')
-rw-r--r--include/core/SkRegion.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/core/SkRegion.h b/include/core/SkRegion.h
index e83e19782f..2aab42385b 100644
--- a/include/core/SkRegion.h
+++ b/include/core/SkRegion.h
@@ -351,13 +351,13 @@ public:
* Write the region to the buffer, and return the number of bytes written.
* If buffer is NULL, it still returns the number of bytes.
*/
- uint32_t flatten(void* buffer) const;
+ uint32_t writeToMemory(void* buffer) const;
/**
* Initialized the region from the buffer, returning the number
* of bytes actually read.
*/
- uint32_t unflatten(const void* buffer);
+ uint32_t readFromMemory(const void* buffer);
/**
* Returns a reference to a global empty region. Just a convenience for