remove SkDeferredCanvas

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 "SkCodec.h"
 #include "SkCommonFlags.h"
 #include "SkData.h"
-#include "SkDeferredCanvas.h"
 #include "SkDocument.h"
 #include "SkError.h"
 #include "SkFunction.h"
 #include "SkImageGenerator.h"
 #include "SkMultiPictureDraw.h"
 #include "SkNullCanvas.h"
 #include "SkOSFile.h"
 #include "SkPictureData.h"
 #include "SkPictureRecorder.h"
 #include "SkRandom.h"
@@ skipping 843 matching lines @@
     return "";
 }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 Error ViaPipe::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const {
     auto size = src.size();
     return draw_to_canvas(fSink, bitmap, stream, log, size, [&](SkCanvas* canvas) {
         PipeController controller(canvas, &SkImageDecoder::DecodeMemory);
         SkGPipeWriter pipe;
-        const uint32_t kFlags = 0; // We mirror SkDeferredCanvas, which doesn't use any flags.
+        const uint32_t kFlags = 0;
         return src.draw(pipe.startRecording(&controller, kFlags, size.width(), size.height()));
     });
 }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-Error ViaDeferred::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const {
-    // We draw via a deferred canvas into a surface that's compatible with the original canvas,
-    // then snap that surface as an image and draw it into the original canvas.
-    return draw_to_canvas(fSink, bitmap, stream, log, src.size(), [&](SkCanvas* canvas) -> Error {
-        SkAutoTUnref<SkSurface> surface(canvas->newSurface(canvas->imageInfo()));
-        if (!surface.get()) {
-            return "can't make surface for deferred canvas";
-        }
-        SkAutoTDelete<SkDeferredCanvas> defcan(SkDeferredCanvas::Create(surface));
-        Error err = src.draw(defcan);
-        if (!err.isEmpty()) {
-            return err;
-        }
-        SkAutoTUnref<SkImage> image(defcan->newImageSnapshot());
-        if (!image) {
-            return "failed to create deferred image snapshot";
-        }
-        canvas->drawImage(image, 0, 0, NULL);
-        return "";
-    });
-}
-
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
 Error ViaSerialization::draw(
         const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const {
     // Record our Src into a picture.
     auto size = src.size();
     SkPictureRecorder recorder;
     Error err = src.draw(recorder.beginRecording(SkIntToScalar(size.width()),
                                                  SkIntToScalar(size.height())));
     if (!err.isEmpty()) {
         return err;
     }
@@ skipping 171 matching lines @@
             skr.visit<void>(i, drawsAsSingletonPictures);
         }
         SkAutoTUnref<SkPicture> macroPic(macroRec.endRecordingAsPicture());
 
         canvas->drawPicture(macroPic);
         return "";
     });
 }
 
 }  // namespace DM