aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm/DMSrcSink.h
diff options
context:
space:
mode:
authorGravatar Yuqian Li <liyuqian@google.com>2018-04-26 21:34:07 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-04-26 21:34:14 +0000
commit47f2b7b089c688503b12caff9c8a84fb185d01c5 (patch)
tree519c301a350acc42878662373c07282cd28e6fa1 /dm/DMSrcSink.h
parent0820a6fb697be598b41b65c7645659e216b30bc5 (diff)
Revert "Reland "Reland "Exercise the threaded backend in test bots"""
This reverts commit 7ddad479e464a3d481d106415c9c1b8cc8496848. Reason for revert: bots failure Original change's description: > Reland "Reland "Exercise the threaded backend in test bots"" > > This reverts commit 0f5972604ce4439fd33118d6be1e4f24fe6c267f. > > Reason for revert: ASAN/MSAN should have been fixed > > Original change's description: > > 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> > > TBR=mtklein@google.com,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: I205d579f2959ea726b447993314c1326b731730e > Reviewed-on: https://skia-review.googlesource.com/123660 > Commit-Queue: Yuqian Li <liyuqian@google.com> > Reviewed-by: Yuqian Li <liyuqian@google.com> TBR=mtklein@google.com,kjlubick@google.com,stephana@google.com,liyuqian@google.com Change-Id: I1d3986cc2af12836dd7acbcbba713081a88301a6 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:7838 Reviewed-on: https://skia-review.googlesource.com/124200 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com>
Diffstat (limited to 'dm/DMSrcSink.h')
-rw-r--r--dm/DMSrcSink.h3
1 files changed, 0 insertions, 3 deletions
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;