Handle inverted rects in SkRRect creation methods

gm/roundrects.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkTArray.h"
 #include "SkRandom.h"
 #include "SkMatrix.h"
 #include "SkBlurMaskFilter.h"
 #include "SkGradientShader.h"
 #include "SkBlurDrawLooper.h"
 #include "SkRect.h"
 #include "SkRRect.h"
 
 namespace skiagm {
 
+static SkColor gen_color(SkRandom* rand) {
+    SkScalar hsv[3];
+    hsv[0] = rand->nextRangeF(0.0f, 360.0f);
+    hsv[1] = rand->nextRangeF(0.75f, 1.0f);
+    hsv[2] = rand->nextRangeF(0.75f, 1.0f);
+
+    return sk_tool_utils::color_to_565(SkHSVToColor(hsv));
+}
+
 class RoundRectGM : public GM {
 public:
     RoundRectGM() {
         this->setBGColor(0xFF000000);
         this->makePaints();
         this->makeMatrices();
     }
 
 protected:
 
@@ skipping 89 matching lines @@
         fMatrices.push_back(m);
         }
 
         {
         SkMatrix m;
         m.setRotate(SkIntToScalar(60));
         fMatrices.push_back(m);
         }
     }
 
-    SkColor genColor(SkRandom* rand) {
-        SkScalar hsv[3];
-        hsv[0] = rand->nextRangeF(0.0f, 360.0f);
-        hsv[1] = rand->nextRangeF(0.75f, 1.0f);
-        hsv[2] = rand->nextRangeF(0.75f, 1.0f);
-
-        return sk_tool_utils::color_to_565(SkHSVToColor(hsv));
-    }
-
     void onDraw(SkCanvas* canvas) override {
         SkRandom rand(1);
         canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1);
-        SkRect rect = SkRect::MakeLTRB(-20, -30, 20, 30);
+        const SkRect rect = SkRect::MakeLTRB(-20, -30, 20, 30);
         SkRRect circleRect;
         circleRect.setRectXY(rect, 5, 5);
 
         const SkScalar kXStart = 60.0f;
         const SkScalar kYStart = 80.0f;
         const int kXStep = 150;
         const int kYStep = 160;
         int maxX = fMatrices.count();
 
         SkPaint rectPaint;
         rectPaint.setAntiAlias(true);
         rectPaint.setStyle(SkPaint::kStroke_Style);
         rectPaint.setStrokeWidth(SkIntToScalar(0));
         rectPaint.setColor(sk_tool_utils::color_to_565(SK_ColorLTGRAY));
 
         int testCount = 0;
         for (int i = 0; i < fPaints.count(); ++i) {
             for (int j = 0; j < fMatrices.count(); ++j) {
                 canvas->save();
                 SkMatrix mat = fMatrices[j];
                 // position the roundrect, and make it at off-integer coords.
                 mat.postTranslate(kXStart + SK_Scalar1 * kXStep * (testCount % maxX) +
                                   SK_Scalar1 / 4,
                                   kYStart + SK_Scalar1 * kYStep * (testCount / maxX) +
                                   3 * SK_Scalar1 / 4);
                 canvas->concat(mat);
 
-                SkColor color = genColor(&rand);
+                SkColor color = gen_color(&rand);
                 fPaints[i].setColor(color);
 
                 canvas->drawRect(rect, rectPaint);
                 canvas->drawRRect(circleRect, fPaints[i]);
 
                 canvas->restore();
 
                 ++testCount;
             }
         }
 
         // special cases
 
         // non-scaled tall and skinny roundrect
         for (int i = 0; i < fPaints.count(); ++i) {
             SkRect rect = SkRect::MakeLTRB(-20, -60, 20, 60);
             SkRRect ellipseRect;
             ellipseRect.setRectXY(rect, 5, 10);
 
             canvas->save();
             // position the roundrect, and make it at off-integer coords.
             canvas->translate(kXStart + SK_Scalar1 * kXStep * 2.55f + SK_Scalar1 / 4,
                               kYStart + SK_Scalar1 * kYStep * i + 3 * SK_Scalar1 / 4);
 
-            SkColor color = genColor(&rand);
+            SkColor color = gen_color(&rand);
             fPaints[i].setColor(color);
 
             canvas->drawRect(rect, rectPaint);
             canvas->drawRRect(ellipseRect, fPaints[i]);
             canvas->restore();
         }
 
         // non-scaled wide and short roundrect
         for (int i = 0; i < fPaints.count(); ++i) {
             SkRect rect = SkRect::MakeLTRB(-80, -30, 80, 30);
             SkRRect ellipseRect;
             ellipseRect.setRectXY(rect, 20, 5);
 
             canvas->save();
             // position the roundrect, and make it at off-integer coords.
             canvas->translate(kXStart + SK_Scalar1 * kXStep * 4 + SK_Scalar1 / 4,
                               kYStart + SK_Scalar1 * kYStep * i + 3 * SK_Scalar1 / 4 +
                               SK_ScalarHalf * kYStep);
 
-            SkColor color = genColor(&rand);
+            SkColor color = gen_color(&rand);
             fPaints[i].setColor(color);
 
             canvas->drawRect(rect, rectPaint);
             canvas->drawRRect(ellipseRect, fPaints[i]);
             canvas->restore();
         }
 
         // super skinny roundrect
         for (int i = 0; i < fPaints.count(); ++i) {
             SkRect rect = SkRect::MakeLTRB(0, -60, 1, 60);
             SkRRect circleRect;
             circleRect.setRectXY(rect, 5, 5);
 
             canvas->save();
             // position the roundrect, and make it at off-integer coords.
             canvas->translate(kXStart + SK_Scalar1 * kXStep * 3.25f + SK_Scalar1 / 4,
                               kYStart + SK_Scalar1 * kYStep * i + 3 * SK_Scalar1 / 4);
 
-            SkColor color = genColor(&rand);
+            SkColor color = gen_color(&rand);
             fPaints[i].setColor(color);
 
             canvas->drawRRect(circleRect, fPaints[i]);
             canvas->restore();
         }
 
         // super short roundrect
         for (int i = 0; i < fPaints.count(); ++i) {
             SkRect rect = SkRect::MakeLTRB(-80, -1, 80, 0);
             SkRRect circleRect;
             circleRect.setRectXY(rect, 5, 5);
 
             canvas->save();
             // position the roundrect, and make it at off-integer coords.
             canvas->translate(kXStart + SK_Scalar1 * kXStep * 2.5f + SK_Scalar1 / 4,
                               kYStart + SK_Scalar1 * kYStep * i + 3 * SK_Scalar1 / 4 +
                               SK_ScalarHalf * kYStep);
 
-            SkColor color = genColor(&rand);
+            SkColor color = gen_color(&rand);
             fPaints[i].setColor(color);
 
             canvas->drawRRect(circleRect, fPaints[i]);
             canvas->restore();
         }
 
         // radial gradient
         SkPoint center = SkPoint::Make(SkIntToScalar(0), SkIntToScalar(0));
         SkColor colors[] = { SK_ColorBLUE, SK_ColorRED, SK_ColorGREEN };
         SkScalar pos[] = { 0, SK_ScalarHalf, SK_Scalar1 };
         SkAutoTUnref<SkShader> shader(SkGradientShader::CreateRadial(center,
                                                      SkIntToScalar(20),
                                                      colors,
                                                      pos,
                                                      SK_ARRAY_COUNT(colors),
                                                      SkShader::kClamp_TileMode));
 
         for (int i = 0; i < fPaints.count(); ++i) {
             canvas->save();
             // position the path, and make it at off-integer coords.
             canvas->translate(kXStart + SK_Scalar1 * kXStep * 0 + SK_Scalar1 / 4,
                               kYStart + SK_Scalar1 * kYStep * i + 3 * SK_Scalar1 / 4 +
                               SK_ScalarHalf * kYStep);
 
-            SkColor color = genColor(&rand);
+            SkColor color = gen_color(&rand);
             fPaints[i].setColor(color);
             fPaints[i].setShader(shader);
 
             canvas->drawRect(rect, rectPaint);
             canvas->drawRRect(circleRect, fPaints[i]);
 
             fPaints[i].setShader(nullptr);
 
             canvas->restore();
         }
@@ skipping 14 matching lines @@
             for (int i = 0; i < 4; ++i) {
                 SkRRect circleRect;
                 circleRect.setRectXY(rect, radii[i][0], radii[i][1]);
 
                 canvas->save();
                 // position the roundrect, and make it at off-integer coords.
                 canvas->translate(kXStart + SK_Scalar1 * kXStep * 5 + SK_Scalar1 / 4,
                                   kYStart + SK_Scalar1 * kYStep * i + 3 * SK_Scalar1 / 4 +
                                   SK_ScalarHalf * kYStep);
 
-                SkColor color = genColor(&rand);
+                SkColor color = gen_color(&rand);
 
                 SkPaint p;
                 p.setAntiAlias(true);
                 p.setStyle(SkPaint::kStroke_Style);
                 p.setStrokeWidth(strokeWidths[i]);
                 p.setColor(color);
 
                 canvas->drawRRect(circleRect, p);
                 canvas->restore();
             }
         }
 
+        // test old entry point (skbug.com/3786)
+        {
+            canvas->save();
+
+            canvas->translate(kXStart + SK_Scalar1 * kXStep * 5 + SK_Scalar1 / 4,
+                              kYStart + SK_Scalar1 * kYStep * 4 + SK_Scalar1 / 4 +
+                              SK_ScalarHalf * kYStep);
+
+            const SkColor color = gen_color(&rand);
+
+            SkPaint p;
+            p.setColor(color);
+
+            const SkRect oooRect = { 20, 30, -20, -30 };     // intentionally out of order
+            canvas->drawRoundRect(oooRect, 10, 10, p);
+
+            canvas->restore();
+        }
     }
 
 private:
     SkTArray<SkPaint> fPaints;
     SkTArray<SkMatrix> fMatrices;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new RoundRectGM; }
 static GMRegistry reg(MyFactory);
 
 }