commit 6eee5c3ec4eb9848c1ab5a54704592d62983d099
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 18 23:59:16 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 18 23:59:16 2013 +0000
tree 267423cc7d1c89f576c33efb81eeebafadcf521e
parent eacb54e174f3b6aa999087d4ce0b879bfe5829c1

Revert r10171 due to test failure in StreamTest



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

gm/gmmain.cpp

diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 3c01156..98525a5 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -410,9 +410,11 @@
         gm_fprintf(stdout, "(results marked with [*] will cause nonzero return value)\n");
     }
 
-    static bool write_document(const SkString& path, SkStreamAsset* asset) {
+    static bool write_document(const SkString& path,
+                               const SkDynamicMemoryWStream& document) {
         SkFILEWStream stream(path.c_str());
-        return stream.writeStream(asset, asset->getLength());
+        SkAutoDataUnref data(document.copyToData());
+        return stream.write(data->data(), data->size());
     }
 
     /**
@@ -663,7 +665,7 @@
                                            const char renderModeDescriptor [],
                                            const char *shortName,
                                            const BitmapAndDigest* bitmapAndDigest,
-                                           SkStreamAsset* document) {
+                                           SkDynamicMemoryWStream* document) {
         SkString path;
         bool success = false;
         if (gRec.fBackend == kRaster_Backend ||
@@ -677,12 +679,12 @@
         if (kPDF_Backend == gRec.fBackend) {
             path = make_filename(writePath, shortName, gRec.fName, renderModeDescriptor,
                                  "pdf");
-            success = write_document(path, document);
+            success = write_document(path, *document);
         }
         if (kXPS_Backend == gRec.fBackend) {
             path = make_filename(writePath, shortName, gRec.fName, renderModeDescriptor,
                                  "xps");
-            success = write_document(path, document);
+            success = write_document(path, *document);
         }
         if (success) {
             return kEmpty_ErrorCombination;
@@ -909,7 +911,7 @@
      */
     ErrorCombination compare_test_results_to_stored_expectations(
         GM* gm, const ConfigData& gRec, const char writePath[],
-        const BitmapAndDigest* actualBitmapAndDigest, SkStreamAsset* document) {
+        const BitmapAndDigest* actualBitmapAndDigest, SkDynamicMemoryWStream* document) {
 
         SkString shortNamePlusConfig = make_shortname_plus_config(gm->shortName(), gRec.fName);
         SkString nameWithExtension(shortNamePlusConfig);
@@ -1023,10 +1025,24 @@
     }
 
     static SkPicture* stream_to_new_picture(const SkPicture& src) {
+
+        // To do in-memory commiunications with a stream, we need to:
+        // * create a dynamic memory stream
+        // * copy it into a buffer
+        // * create a read stream from it
+        // ?!?!
+
         SkDynamicMemoryWStream storage;
         src.serialize(&storage);
-        SkAutoTUnref<SkStreamAsset> pictReadback(storage.detatchAsStream());
-        SkPicture* retval = SkPicture::CreateFromStream(pictReadback);
+
+        size_t streamSize = storage.getOffset();
+        SkAutoMalloc dstStorage(streamSize);
+        void* dst = dstStorage.get();
+        //char* dst = new char [streamSize];
+        //@todo thudson 22 April 2011 when can we safely delete [] dst?
+        storage.copyTo(dst);
+        SkMemoryStream pictReadback(dst, streamSize);
+        SkPicture* retval = SkPicture::CreateFromStream(&pictReadback);
         return retval;
     }
 
@@ -1063,14 +1079,13 @@
             bitmap = NULL;  // we don't generate a bitmap rendering of the XPS file
         }
 
-        SkAutoTUnref<SkStreamAsset> documentStream(document.detatchAsStream());
         if (NULL == bitmap) {
             return compare_test_results_to_stored_expectations(
-                gm, gRec, writePath, NULL, documentStream);
+                gm, gRec, writePath, NULL, &document);
         } else {
             BitmapAndDigest bitmapAndDigest(*bitmap);
             return compare_test_results_to_stored_expectations(
-                gm, gRec, writePath, &bitmapAndDigest, documentStream);
+                gm, gRec, writePath, &bitmapAndDigest, &document);
         }
     }
 
@@ -1078,6 +1093,8 @@
                                            const ConfigData& gRec,
                                            const SkBitmap& referenceBitmap,
                                            GrSurface* gpuTarget) {
+        SkDynamicMemoryWStream document;
+
         if (gRec.fBackend == kRaster_Backend ||
             gRec.fBackend == kGPU_Backend) {
             const char renderModeDescriptor[] = "-deferred";