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>

Author: cary-clark

gm/shapes.cpp

@@ -19,6 +19,15 @@ namespace skiagm {
 class ShapesGM : public GM {
 protected:
     ShapesGM(const char* name, bool antialias) : fName(name), fAntialias(antialias) {
+        if (!antialias) {
+            fName.append("_bw");
+        }
+    }
+
+    SkString onShortName() override final { return fName; }
+    SkISize onISize() override { return SkISize::Make(500, 500); }
+
+    void onOnceBeforeDraw() override {
         fShapes.push_back().setOval(SkRect::MakeXYWH(-5, 25, 200, 100));
         fRotations.push_back(21);
 
@@ -50,15 +59,6 @@ class ShapesGM : public GM {
         fShapes.push_back().setRectRadii(SkRect::MakeXYWH(180, -30, 80, 60), radii2);
         fRotations.push_back(295);
 
-        if (!antialias) {
-            fName.append("_bw");
-        }
-    }
-
-    SkString onShortName() override final { return fName; }
-    SkISize onISize() override { return SkISize::Make(500, 500); }
-
-    void onOnceBeforeDraw() override {
         fPaint.setAntiAlias(fAntialias);
     }
 

samplecode/SampleAARects.cpp

@@ -38,24 +38,24 @@ class AARectView : public SampleView {
     enum {
         N = 64
     };
-public:
-    AARectView() {
+
+protected:
+    void onOnceBeforeDraw() override {
         fBitmap = createBitmap(N);
 
         fWidth = N;
     }
 
-protected:
     // overrides from SkEventSink
-    virtual bool onQuery(SkEvent* evt) {
+    bool onQuery(SkEvent* evt) override {
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "AA Rects");
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
 
-    virtual void onDrawContent(SkCanvas* canvas) {
+    void onDrawContent(SkCanvas* canvas) override {
         canvas->translate(SkIntToScalar(10), SkIntToScalar(10));
 
         SkPaint bluePaint;

samplecode/SampleColorFilter.cpp

@@ -113,8 +113,9 @@ class ColorFilterView : public SampleView {
     enum {
         N = 64
     };
-public:
-    ColorFilterView() {
+
+protected:
+    void onOnceBeforeDraw() override {
         fBitmap = createBitmap(N);
         fShader = sk_tool_utils::create_checkerboard_shader(
                 0xFFCCCCCC, 0xFFFFFFFF, 12);
@@ -124,23 +125,22 @@ class ColorFilterView : public SampleView {
         }
     }
 
-protected:
     // overrides from SkEventSink
-    virtual bool onQuery(SkEvent* evt) {
+    bool onQuery(SkEvent* evt) override {
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "ColorFilter");
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
 
-    virtual void onDrawBackground(SkCanvas* canvas) {
+    void onDrawBackground(SkCanvas* canvas) override {
         SkPaint paint;
         paint.setShader(fShader);
         canvas->drawPaint(paint);
     }
 
-    virtual void onDrawContent(SkCanvas* canvas) {
+    void onDrawContent(SkCanvas* canvas) override {
         if (false) {
             SkPaint p;
             p.setAntiAlias(true);

samplecode/SampleDither.cpp

@@ -108,7 +108,8 @@ class DitherView : public SampleView {
     SkBitmap    fBM, fBMPreDither, fBM16;
     SkScalar fAngle;
 
-    DitherView() {
+protected:
+    void onOnceBeforeDraw() override {
         make_bm(&fBM);
         make_bm(&fBMPreDither);
         pre_dither(fBMPreDither);
@@ -119,17 +120,16 @@ class DitherView : public SampleView {
         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;
         }
         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);

src/core/SkPath.cpp

@@ -539,16 +539,17 @@ bool SkPath::isRectContour(bool allowPartial, int* currVerb, const SkPoint** pts
         ;
     }
     // Success if 4 corners and first point equals last
-    bool result = 4 == corners && (first == last || autoClose);
+    SkScalar closeX = first.x() - last.x();
+    SkScalar closeY = first.y() - last.y();
+    // If autoClose, check if close generates diagonal
+    bool result = 4 == corners && (first == last || (autoClose && (!closeX || !closeY)));
     if (!result) {
         // check if we are just an incomplete rectangle, in which case we can
         // return true, but not claim to be closed.
         // e.g.
         //    3 sided rectangle
         //    4 sided but the last edge is not long enough to reach the start
         //
-        SkScalar closeX = first.x() - last.x();
-        SkScalar closeY = first.y() - last.y();
         if (closeX && closeY) {
             return false;   // we're diagonal, abort (can we ever reach this?)
         }

tests/PathTest.cpp

@@ -4911,4 +4911,11 @@ DEF_TEST(Path_isRect, reporter) {
     SkRect compare;
     compare.set(&points[1], SK_ARRAY_COUNT(points) - 1);
     REPORTER_ASSERT(reporter, rect == compare);
+    path.reset();
+    SkPoint points2[] = { {75, 50}, {100, 75}, {150, 75}, {150, 150}, {75, 150}, {75, 50} };
+    for (size_t index = 0; index < SK_ARRAY_COUNT(points); ++index) {
+        index < 2 ? path.moveTo(points2[index]) : path.lineTo(points2[index]);
+    }
+    path.close();
+    REPORTER_ASSERT(reporter, !path.isRect(&rect, nullptr, nullptr));
 }