diff options
author | 2017-12-19 20:20:13 +0000 | |
---|---|---|
committer | 2017-12-19 20:20:17 +0000 | |
commit | 394197d064d976675a7952857ed5ee98e0c9edca (patch) | |
tree | c9063a5e320ea18d19d86e275cd1c7dcb978b220 /samplecode | |
parent | b0abd8502b350a67d6c6568c08ca1215567be2f6 (diff) |
Revert "efficiently dash very large rectangles and very long lines"
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 <caryclark@skia.org>
> Reviewed-by: Mike Reed <reed@google.com>
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 <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
Diffstat (limited to 'samplecode')
-rw-r--r-- | samplecode/SampleAARects.cpp | 10 | ||||
-rw-r--r-- | samplecode/SampleDither.cpp | 9 |
2 files changed, 7 insertions, 12 deletions
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; diff --git a/samplecode/SampleDither.cpp b/samplecode/SampleDither.cpp index 79adc629fa..fbe25ddcaa 100644 --- a/samplecode/SampleDither.cpp +++ b/samplecode/SampleDither.cpp @@ -109,10 +109,6 @@ public: SkScalar fAngle; DitherView() { - } - -protected: - void onOnceBeforeDraw() override { make_bm(&fBM); make_bm(&fBMPreDither); pre_dither(fBMPreDither); @@ -123,8 +119,9 @@ protected: this->setBGColor(0xFF181818); } +protected: // overrides from SkEventSink - bool onQuery(SkEvent* evt) override { + virtual bool onQuery(SkEvent* evt) { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Dither"); return true; @@ -132,7 +129,7 @@ protected: return this->INHERITED::onQuery(evt); } - void onDrawContent(SkCanvas* canvas) override { + virtual void onDrawContent(SkCanvas* canvas) { SkPaint paint; SkScalar x = SkIntToScalar(10); SkScalar y = SkIntToScalar(10); |