diff options
author | Mike Klein <mtklein@google.com> | 2018-04-23 23:58:27 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-23 23:58:37 +0000 |
commit | 0f5972604ce4439fd33118d6be1e4f24fe6c267f (patch) | |
tree | 608849bfb1237a4fc7073a481273de9729fa9425 /dm | |
parent | 9e268ed3157b37952f90406ec9828b3f54e6c6e3 (diff) |
Revert "Reland "Exercise the threaded backend in test bots""
This reverts commit 654ca8a340700ca8089abb7828adc2c229c6241e.
Reason for revert: ASAN,MSAN failures
Original change's description:
> Reland "Exercise the threaded backend in test bots"
>
> This reverts commit ea51393ba918f75c1b40d521081789eeb3b42d6f.
>
> Reason for revert: try again after many fixes of the threaded backend
>
> Original change's description:
> > Revert "Exercise the threaded backend in test bots"
> >
> > This reverts commit a39991ebd70f4aaf1290dd516467d729811e45ee.
> >
> > Reason for revert: Random bots timeout
> >
> > Original change's description:
> > > Exercise the threaded backend in test bots
> > >
> > > We can't draw everything correctly now, but it's at least not crashing.
> > >
> > > The draw_to_canvas is modified by adding flush because now the raster
> > > canvas also needs flush like GPU canvases because of the threaded
> > > backend. (Previously, AndroidCodecSrc vetoed GPU (non-raster) sink
> > > and that's why it was not crashing.)
> > >
> > >
> > > Bug: skia:
> > > Change-Id: I222d706c33e15326e1b97d6bef6c46b8c35cebfd
> > > Reviewed-on: https://skia-review.googlesource.com/118886
> > > Reviewed-by: Kevin Lubick <kjlubick@google.com>
> > > Commit-Queue: Yuqian Li <liyuqian@google.com>
> >
> > TBR=kjlubick@google.com,stephana@google.com,liyuqian@google.com
> >
> > Change-Id: Ib1089d937b6e25cc39d90ad4de35b3a4c406f6b1
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: skia:
> > Reviewed-on: https://skia-review.googlesource.com/119100
> > Reviewed-by: Yuqian Li <liyuqian@google.com>
> > Commit-Queue: Yuqian Li <liyuqian@google.com>
>
> TBR=kjlubick@google.com,stephana@google.com,liyuqian@google.com
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: skia:7838
> Change-Id: I1405212204bf694b2f31dfc38154759e1d3e363f
> Reviewed-on: https://skia-review.googlesource.com/121680
> Commit-Queue: Yuqian Li <liyuqian@google.com>
> Reviewed-by: Yuqian Li <liyuqian@google.com>
TBR=kjlubick@google.com,stephana@google.com,liyuqian@google.com
Change-Id: Id1b273e22a1d0cbc15a2155252909f576b401fa4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7838
Reviewed-on: https://skia-review.googlesource.com/123360
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'dm')
-rw-r--r-- | dm/DMSrcSink.cpp | 1 | ||||
-rw-r--r-- | dm/DMSrcSink.h | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index bab344b1e5..a086094414 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -418,7 +418,6 @@ static void draw_to_canvas(SkCanvas* canvas, const SkImageInfo& info, void* pixe premultiply_if_necessary(bitmap); swap_rb_if_necessary(bitmap, dstColorType); canvas->drawBitmap(bitmap, left, top); - canvas->flush(); } // For codec srcs, we want the "draw" step to be a memcpy. Any interesting color space or diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index d98b4a093d..5ba11e57be 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -433,9 +433,6 @@ class ThreadedSink : public RasterSink { public: explicit ThreadedSink(SkColorType, sk_sp<SkColorSpace> = nullptr); Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override; - SinkFlags flags() const override { - return SinkFlags{ SinkFlags::kRaster, SinkFlags::kIndirect }; - } private: std::unique_ptr<SkExecutor> fExecutor; |