Revert "makeSurface defaults to raster"
This reverts commit 29a4a684af2525d78a1090fba2d3dea2b6a59fc7.
Reason for revert: some configs fail
Original change's description:
> makeSurface defaults to raster
>
> Rather that returning nullptr for a recording
> canvas, return a raster canvas instead.
>
> R=​reed@google.com,robertphillips@google.com
>
> Bug: skia:
> Change-Id: I211d8ef368b9aec6d14cc72d1652ac6a03f3fa7b
> Reviewed-on: https://skia-review.googlesource.com/151666
> Commit-Queue: Cary Clark <caryclark@skia.org>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=robertphillips@google.com,reed@google.com,caryclark@skia.org
Change-Id: I82d2c3e4589a2ca8523bbf86884ed68b1431631d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/151824
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 620f2a4..04d3b55 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -1901,6 +1901,9 @@
// This lets our ultimate Sink determine the best kind of surface.
// E.g., if it's a GpuSink, the surfaces and images are textures.
auto s = canvas->makeSurface(info);
+ if (!s) {
+ s = SkSurface::MakeRaster(info); // Some canvases can't create surfaces.
+ }
surfaces.push_back(s);
SkCanvas* c = s->getCanvas();
c->translate(SkIntToScalar(-i * fW),