diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-08 18:30:46 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-08 18:30:46 +0000 |
| commit | 94e75ee46a569cbcdf61fb7f04ee3a69d3ca0896 (patch) | |
| tree | 69459ed6333c977be86dd36e503593a44a067e94 /src/core/SkRegion.cpp | |
| parent | 97caebc7462c202ab0ec5cce4eb26a616930813e (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 'src/core/SkRegion.cpp')
| -rw-r--r-- | src/core/SkRegion.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkRegion.cpp b/src/core/SkRegion.cpp index e403b1956a..ce5ed8af2d 100644 --- a/src/core/SkRegion.cpp +++ b/src/core/SkRegion.cpp @@ -1076,7 +1076,7 @@ bool SkRegion::op(const SkRegion& rgna, const SkRegion& rgnb, Op op) { #include "SkBuffer.h" -uint32_t SkRegion::flatten(void* storage) const { +uint32_t SkRegion::writeToMemory(void* storage) const { if (NULL == storage) { uint32_t size = sizeof(int32_t); // -1 (empty), 0 (rect), runCount if (!this->isEmpty()) { @@ -1109,7 +1109,7 @@ uint32_t SkRegion::flatten(void* storage) const { return buffer.pos(); } -uint32_t SkRegion::unflatten(const void* storage) { +uint32_t SkRegion::readFromMemory(const void* storage) { SkRBuffer buffer(storage); SkRegion tmp; int32_t count; |