move common code into shared helper function

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

1 files changed, 10 insertions, 10 deletions

diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp
index 16ff98a42d..6f00369a87 100644
--- a/src/core/SkStream.cpp
+++ b/src/core/SkStream.cpp
@@ -255,6 +255,14 @@ size_t SkFILEStream::read(void* buffer, size_t size)
 
 ///////////////////////////////////////////////////////////////////////////////
 
+static SkData* newFromParams(const void* src, size_t size, bool copyData) {
+    if (copyData) {
+        return SkData::NewWithCopy(src, size);
+    } else {
+        return SkData::NewWithProc(src, size, NULL, NULL);
+    }
+}
+
 SkMemoryStream::SkMemoryStream() {
     fData = SkData::NewEmpty();
     fOffset = 0;
@@ -266,11 +274,7 @@ SkMemoryStream::SkMemoryStream(size_t size) {
 }
 
 SkMemoryStream::SkMemoryStream(const void* src, size_t size, bool copyData) {
-    if (copyData) {
-        fData = SkData::NewWithCopy(src, size);
-    } else {
-        fData = SkData::NewWithProc(src, size, NULL, NULL);
-    }
+    fData = newFromParams(src, size, copyData);
     fOffset = 0;
 }
 
@@ -286,11 +290,7 @@ void SkMemoryStream::setMemoryOwned(const void* src, size_t size) {
 
 void SkMemoryStream::setMemory(const void* src, size_t size, bool copyData) {
     fData->unref();
-    if (copyData) {
-        fData = SkData::NewWithCopy(src, size);
-    } else {
-        fData = SkData::NewWithProc(src, size, NULL, NULL);
-    }
+    fData = newFromParams(src, size, copyData);
     fOffset = 0;
 }