commit a4c6094177ebde18c706cbcfbd2013d0a088e0ee
author halcanary <halcanary@google.com> Tue Aug 26 10:38:07 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Aug 26 10:38:07 2014 -0700
tree c2617b0d0a22196f3f8947bb62e067983c0a8f19
parent f2d83caf13afb09deae6355e2f59aa17b7c09058

SkData to SkStreamAsset to avoid unneeded copying

R=mtklein@google.com

Author: halcanary@google.com

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

dm/DMWriteTask.cpp

diff --git a/dm/DMWriteTask.cpp b/dm/DMWriteTask.cpp
index b8ce318..5a07e46 100644
--- a/dm/DMWriteTask.cpp
+++ b/dm/DMWriteTask.cpp
@@ -41,11 +41,14 @@
     , fData(NULL)
     , fExtension(".png") {}
 
-WriteTask::WriteTask(const Task& parent, SkData *data, const char* ext)
+WriteTask::WriteTask(const Task& parent, SkStreamAsset *data, const char* ext)
     : CpuTask(parent)
     , fGmName(find_gm_name(parent, &fSuffixes))
-    , fData(SkRef(data))
-    , fExtension(ext) {}
+    , fData(data)
+    , fExtension(ext) {
+    SkASSERT(fData.get());
+    SkASSERT(fData->unique());
+}
 
 void WriteTask::makeDirOrFail(SkString dir) {
     if (!sk_mkdir(dir.c_str())) {
@@ -115,9 +118,10 @@
 };
 
 // Does not take ownership of data.
-bool save_data_to_file(const SkData* data, const char* path) {
+bool save_data_to_file(SkStreamAsset* data, const char* path) {
+    data->rewind();
     SkFILEWStream stream(path);
-    if (!stream.isValid() || !stream.write(data->data(), data->size())) {
+    if (!stream.isValid() || !stream.writeStream(data, data->getLength())) {
         SkDebugf("Can't write %s.\n", path);
         return false;
     }
@@ -142,7 +146,7 @@
     SkString path = SkOSPath::Join(dir.c_str(), fGmName.c_str());
     path.append(fExtension);
 
-    const bool ok = fData.get() ? save_data_to_file(fData,   path.c_str())
+    const bool ok = fData.get() ? save_data_to_file(fData.get(), path.c_str())
                                 : PngAndRaw::Encode(fBitmap, path.c_str());
     if (!ok) {
         this->fail();