commit c29f3d8c6dec938fd0599db30cae590fcaa2108b
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jul 19 22:32:11 2013 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jul 19 22:32:11 2013 +0000
tree d92ce1ba4cddd6e37c8eda6a38a9f683a70037b4
parent 2b0ab9e13a7d0f4e8a4151d5b75a8520546b4862

Add a detachAsStream to SkDynamicMemoryWStream.

R=reed@google.com

Committed: https://code.google.com/p/skia/source/detail?r=10171

Committed: https://code.google.com/p/skia/source/detail?r=10178

Review URL: https://codereview.chromium.org/19677002

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

gm/gmmain.cpp

diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 3c01156..01eaaeb 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -1025,7 +1025,7 @@
     static SkPicture* stream_to_new_picture(const SkPicture& src) {
         SkDynamicMemoryWStream storage;
         src.serialize(&storage);
-        SkAutoTUnref<SkStreamAsset> pictReadback(storage.detatchAsStream());
+        SkAutoTUnref<SkStreamAsset> pictReadback(storage.detachAsStream());
         SkPicture* retval = SkPicture::CreateFromStream(pictReadback);
         return retval;
     }
@@ -1063,7 +1063,7 @@
             bitmap = NULL;  // we don't generate a bitmap rendering of the XPS file
         }
 
-        SkAutoTUnref<SkStreamAsset> documentStream(document.detatchAsStream());
+        SkAutoTUnref<SkStreamAsset> documentStream(document.detachAsStream());
         if (NULL == bitmap) {
             return compare_test_results_to_stored_expectations(
                 gm, gRec, writePath, NULL, documentStream);

include/core/SkStream.h

diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index 8180a0a..d7a105d 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -427,7 +427,7 @@
     SkData* copyToData() const;
 
     /** Reset, returning a reader stream with the current content. */
-    SkStreamAsset* detatchAsStream();
+    SkStreamAsset* detachAsStream();
 
     /** Reset the stream to its original, empty, state. */
     void reset();

src/core/SkStream.cpp

diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp
index b251905..36a6f96 100644
--- a/src/core/SkStream.cpp
+++ b/src/core/SkStream.cpp
@@ -781,7 +781,7 @@
     size_t fCurrentOffset;
 };
 
-SkStreamAsset* SkDynamicMemoryWStream::detatchAsStream() {
+SkStreamAsset* SkDynamicMemoryWStream::detachAsStream() {
     if (fCopy) {
         SkMemoryStream* stream = SkNEW_ARGS(SkMemoryStream, (fCopy));
         this->reset();

tests/StreamTest.cpp

diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp
index 1eb1282..29d74fe 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -93,7 +93,7 @@
     }
 
     {
-        SkAutoTUnref<SkStreamAsset> stream(ds.detatchAsStream());
+        SkAutoTUnref<SkStreamAsset> stream(ds.detachAsStream());
         REPORTER_ASSERT(reporter, 100 * 26 == stream->getLength());
         REPORTER_ASSERT(reporter, ds.getOffset() == 0);
         test_loop_stream(reporter, stream.get(), s, 26, 100);
@@ -123,7 +123,7 @@
 
     {
         // Test that this works after a copyToData.
-        SkAutoTUnref<SkStreamAsset> stream(ds.detatchAsStream());
+        SkAutoTUnref<SkStreamAsset> stream(ds.detachAsStream());
         REPORTER_ASSERT(reporter, ds.getOffset() == 0);
         test_loop_stream(reporter, stream.get(), s, 26, 100);