diff options
| -rw-r--r-- | gm/gmmain.cpp | 4 | ||||
| -rw-r--r-- | include/core/SkStream.h | 2 | ||||
| -rw-r--r-- | src/core/SkStream.cpp | 2 | ||||
| -rw-r--r-- | tests/StreamTest.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index 3c01156653..01eaaebffd 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -1025,7 +1025,7 @@ public: 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 @@ public: 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); diff --git a/include/core/SkStream.h b/include/core/SkStream.h index 8180a0a819..d7a105d3b8 100644 --- a/include/core/SkStream.h +++ b/include/core/SkStream.h @@ -427,7 +427,7 @@ public: 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(); diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp index b251905633..36a6f96fcd 100644 --- a/src/core/SkStream.cpp +++ b/src/core/SkStream.cpp @@ -781,7 +781,7 @@ private: size_t fCurrentOffset; }; -SkStreamAsset* SkDynamicMemoryWStream::detatchAsStream() { +SkStreamAsset* SkDynamicMemoryWStream::detachAsStream() { if (fCopy) { SkMemoryStream* stream = SkNEW_ARGS(SkMemoryStream, (fCopy)); this->reset(); diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp index 1eb1282ba7..29d74fe9d8 100644 --- a/tests/StreamTest.cpp +++ b/tests/StreamTest.cpp @@ -93,7 +93,7 @@ static void TestWStream(skiatest::Reporter* reporter) { } { - 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 @@ static void TestWStream(skiatest::Reporter* reporter) { { // 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); |