Revert of BitmapTextBatch and BitmapTextBlob

dm/DMSrcSink.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "DMSrcSink.h"
 #include "SamplePipeControllers.h"
 #include "SkCommonFlags.h"
@@ skipping 225 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, &lazy_decode_bitmap));
     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
-    // TODO remove this and add a flag to DM so we can run skps multiple times
-//#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 override { return fSize; }
         Name name() const 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