diff options
author | Cary Clark <caryclark@google.com> | 2018-04-10 09:16:41 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-10 14:17:21 +0000 |
commit | 58627cb8eb559670b86f06225eb87e6c1c5e8504 (patch) | |
tree | eae6ea1a216052198638725f4573b0e26d8f6933 /samplecode/SampleDither.cpp | |
parent | 5c715188470e97e4f573ffe78b7ee9451aaa7612 (diff) |
one more path is rect bug
Add a check to see that the close path generated line
is horizontal or vertical when determining that path
is a rect.
Also change several tests to defer their initialization
to reduce debugging interference.
R=brianosman@google.com,robertphillips@google.com
Bug: 824145,skia:7792
Change-Id: I4a081ee4ffd3558b499a7a1aede2d6232059715e
Reviewed-on: https://skia-review.googlesource.com/120081
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
Diffstat (limited to 'samplecode/SampleDither.cpp')
-rw-r--r-- | samplecode/SampleDither.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/SampleDither.cpp b/samplecode/SampleDither.cpp index fbe25ddcaa..1dd42710ce 100644 --- a/samplecode/SampleDither.cpp +++ b/samplecode/SampleDither.cpp @@ -108,7 +108,8 @@ public: SkBitmap fBM, fBMPreDither, fBM16; SkScalar fAngle; - DitherView() { +protected: + void onOnceBeforeDraw() override { make_bm(&fBM); make_bm(&fBMPreDither); pre_dither(fBMPreDither); @@ -119,9 +120,8 @@ public: this->setBGColor(0xFF181818); } -protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) { + bool onQuery(SkEvent* evt) override { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Dither"); return true; @@ -129,7 +129,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) { + void onDrawContent(SkCanvas* canvas) override { SkPaint paint; SkScalar x = SkIntToScalar(10); SkScalar y = SkIntToScalar(10); |