From 394197d064d976675a7952857ed5ee98e0c9edca Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Tue, 19 Dec 2017 20:20:13 +0000 Subject: Revert "efficiently dash very large rectangles and very long lines" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1ad81981b0027e96ef0cecd78661ab2c22bdc4aa. Reason for revert: broke chrome layout tests Original change's description: > efficiently dash very large rectangles and very long lines > > Speed up dashing when lines and rects are absurdly large. > > Prior to this CL, only horizontal lines were detected. > > The onOnceBeforeDraw changes are there to make debugging easier. > > Also folded in a change to handle dashing of zero length lines. > > R=​reed@google.com, egdaniel@google.com > Bug: skia:7311 > Change-Id: Ia16fb124c7a78a5cc639e612fae29c879a37da1a > Reviewed-on: https://skia-review.googlesource.com/84862 > Commit-Queue: Cary Clark > Reviewed-by: Mike Reed TBR=egdaniel@google.com,reed@google.com,caryclark@skia.org Change-Id: I5e8f04c54486f8cd1a931f6cade92feaaa4a7647 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:7311 Reviewed-on: https://skia-review.googlesource.com/87282 Reviewed-by: Cary Clark Commit-Queue: Cary Clark --- samplecode/SampleAARects.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'samplecode/SampleAARects.cpp') diff --git a/samplecode/SampleAARects.cpp b/samplecode/SampleAARects.cpp index c50c39f5af..942242b02e 100644 --- a/samplecode/SampleAARects.cpp +++ b/samplecode/SampleAARects.cpp @@ -39,16 +39,14 @@ class AARectView : public SampleView { }; public: AARectView() { - } - -protected: - void onOnceBeforeDraw() override { fBitmap = createBitmap(N); + fWidth = N; } +protected: // overrides from SkEventSink - bool onQuery(SkEvent* evt) override { + virtual bool onQuery(SkEvent* evt) { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "AA Rects"); return true; @@ -56,7 +54,7 @@ protected: return this->INHERITED::onQuery(evt); } - void onDrawContent(SkCanvas* canvas) override { + virtual void onDrawContent(SkCanvas* canvas) { canvas->translate(SkIntToScalar(10), SkIntToScalar(10)); SkPaint bluePaint; -- cgit v1.2.3