BitmapTextBatch and BitmapTextBlob

dm/DMSrcSink.cpp

 #include "DMSrcSink.h"
 #include "SamplePipeControllers.h"
 #include "SkCommonFlags.h"
 #include "SkCodec.h"
 #include "SkDocument.h"
 #include "SkError.h"
 #include "SkMultiPictureDraw.h"
 #include "SkNullCanvas.h"
 #include "SkOSFile.h"
 #include "SkPictureData.h"
@@ skipping 183 matching lines @@
 Error SKPSrc::draw(SkCanvas* canvas) const {
     SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(fPath.c_str()));
     if (!stream) {
         return SkStringPrintf("Couldn't read %s.", fPath.c_str());
     }
     SkAutoTUnref<SkPicture> pic(SkPicture::CreateFromStream(stream));
     if (!pic) {
         return SkStringPrintf("Couldn't decode %s as a picture.", fPath.c_str());
     }
     stream.reset((SkStream*)NULL);  // Might as well drop this when we're done with it.
+
     canvas->clipRect(kSKPViewport);
+    // Testing TextBlob batching requires that we see individual text blobs more than once
+//#define DOUBLE_LOOP

[bsalomon, 2015/03/24 16:27:53]

Let's make this real... 

Maybe make dm take a param --numSkpDraws <n> and it draws the skps n times and
outputs n images to gold with a tag 1..n for each. It shouldn't add much
baselining overhead since they will usually be identical. We keep adding more
caches to both the cpu and gpu backends, it'd be good to verify that we draw the
same (or nearly so) on a cache hit.

(separate CL, obviously)

[joshualitt, 2015/03/25 14:13:37]

Acknowledged.

+#ifdef DOUBLE_LOOP
+    {
+        SkAutoCanvasRestore acr(canvas, true);
+#endif
+        canvas->drawPicture(pic);
+#ifdef DOUBLE_LOOP
+    }
+    canvas->clear(0);
     canvas->drawPicture(pic);
+#endif
     return "";
 }
 
 SkISize SKPSrc::size() const {
     SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(fPath.c_str()));
     if (!stream) {
         return SkISize::Make(0,0);
     }
     SkPictInfo info;
     if (!SkPicture::InternalOnly_StreamIsSKP(stream, &info)) {
@@ skipping 358 matching lines @@
             surfaces.unrefAll();
             return "";
         }
         SkISize size() const SK_OVERRIDE { return fSize; }
         Name name() const SK_OVERRIDE { sk_throw(); return ""; }  // No one should be calling this.
     } proxy(fW, fH, pic, src.size());
     return fSink->draw(proxy, bitmap, stream, log);
 }
 
 }  // namespace DM