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

[bsalomon, 2015/03/26 17:06:55]

revert before landing?

[joshualitt, 2015/03/26 18:21:43]

I'll fix this when I land the better fix to DM.  I'd rather leave this in so we
have some manual way to test this.

+//#define DOUBLE_LOOP
+#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