Fix GrAARectRenderer's handling of unsorted nested rects

gm/nested.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 "SkRandom.h"
 #include "SkRRect.h"
 
 namespace skiagm {
 
 // Test out various combinations of nested rects, ovals and rrects.
 class NestedGM : public GM {
 public:
-    NestedGM(bool doAA) : fDoAA(doAA) {
+    NestedGM(bool doAA, bool flipped) : fDoAA(doAA), fFlipped(flipped) {
         this->setBGColor(0xFFDDDDDD);
     }
 
 protected:
 
     SkString onShortName() override {
         SkString name("nested");
+        if (fFlipped) {
+            name.append("_flipY");
+        }
         if (fDoAA) {
             name.append("_aa");
         } else {
             name.append("_bw");
         }
         return name;
     }
 
     SkISize onISize() override {
         return SkISize::Make(kImageWidth, kImageHeight);
@@ skipping 45 matching lines @@
             for (int x = 0; x < kImageWidth; x += 10) {
                 SkRect r = SkRect::MakeXYWH(SkIntToScalar(x),
                                             SkIntToScalar(y),
                                             10, 10);
                 SkPaint p;
                 p.setColor(rand.nextU() | 0xFF000000);
                 canvas->drawRect(r, p);
             }
         }
 
-        canvas->translate(2, 2);
+        SkScalar xOff = 2, yOff = 2;
         for (int outerShape = 0; outerShape < kShapeCount; ++outerShape) {
-            canvas->save();
             for (int innerShape = 0; innerShape < kShapeCount; ++innerShape) {
                 for (size_t innerRect = 0; innerRect < SK_ARRAY_COUNT(innerRects); ++innerRect) {
                     SkPath path;
 
                     AddShape(&path, outerRect, (Shapes) outerShape, SkPath::kCW_Direction);
                     AddShape(&path, innerRects[innerRect], (Shapes) innerShape,
                              SkPath::kCCW_Direction);
 
+                    canvas->save();
+                    if (fFlipped) {
+                        canvas->scale(1.0f, -1.0f);
+                        canvas->translate(xOff, -yOff - 40.0f);
+                    } else {
+                        canvas->translate(xOff, yOff);
+                    }
+
                     canvas->drawPath(path, shapePaint);
-                    canvas->translate(45, 0);
+                    canvas->restore();
+
+                    xOff += 45;
                 }
             }
-            canvas->restore();
-            canvas->translate(0, 45);
+
+            xOff = 2;
+            yOff += 45;
         }
 
     }
 
 private:
     static const int kImageWidth = 269;
     static const int kImageHeight = 134;
 
     bool fDoAA;
+    bool fFlipped;
 
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-DEF_GM( return new NestedGM(true); )
-DEF_GM( return new NestedGM(false); )
-
+DEF_GM( return new NestedGM(/* doAA = */ true,  /* flipped = */ false); )
+DEF_GM( return new NestedGM(/* doAA = */ false, /* flipped = */ false); )
+DEF_GM( return new NestedGM(/* doAA = */ true,  /* flipped = */ true); )
+DEF_GM( return new NestedGM(/* doAA = */ false, /* flipped = */ true); )
 
 }