add inverted path draw cases to complexclip gm

gm/complexclip.cpp

 
 /*
  * Copyright 2011 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 "SkCanvas.h"
 //#include "SkParsePath.h"
 #include "SkPath.h"
 //#include "SkRandom.h"
 
 namespace skiagm {
 
 static const SkColor gPathColor = SK_ColorBLACK;
 static const SkColor gClipAColor = SK_ColorBLUE;
 static const SkColor gClipBColor = SK_ColorRED;
 
 class ComplexClipGM : public GM {
-    bool fDoAAClip;
-    bool fDoSaveLayer;
 public:
-    ComplexClipGM(bool aaclip, bool saveLayer)
+    ComplexClipGM(bool aaclip, bool saveLayer, bool invertDraw)
     : fDoAAClip(aaclip)
-    , fDoSaveLayer(saveLayer) {
+    , fDoSaveLayer(saveLayer)
+    , fInvertDraw(invertDraw) {
         this->setBGColor(0xFFDDDDDD);
-//        this->setBGColor(SkColorSetRGB(0xB0,0xDD,0xB0));
     }
 
 protected:
     virtual uint32_t onGetFlags() const SK_OVERRIDE {
         return kSkipTiled_Flag;
     }
 
 
     SkString onShortName() {
         SkString str;
-        str.printf("complexclip_%s%s",
+        str.printf("complexclip_%s%s%s",
                    fDoAAClip ? "aa" : "bw",
-                   fDoSaveLayer ? "_layer" : "");
+                   fDoSaveLayer ? "_layer" : "",
+                   fInvertDraw ? "_invert" : "");
         return str;
     }
 
     SkISize onISize() { return SkISize::Make(970, 780); }
 
     virtual void onDraw(SkCanvas* canvas) {
         SkPath path;
         path.moveTo(SkIntToScalar(0),   SkIntToScalar(50));
         path.quadTo(SkIntToScalar(0),   SkIntToScalar(0),   SkIntToScalar(50),  SkIntToScalar(0));
         path.lineTo(SkIntToScalar(175), SkIntToScalar(0));
         path.quadTo(SkIntToScalar(200), SkIntToScalar(0),   SkIntToScalar(200), SkIntToScalar(25));
         path.lineTo(SkIntToScalar(200), SkIntToScalar(150));
         path.quadTo(SkIntToScalar(200), SkIntToScalar(200), SkIntToScalar(150), SkIntToScalar(200));
         path.lineTo(SkIntToScalar(0),   SkIntToScalar(200));
         path.close();
         path.moveTo(SkIntToScalar(50),  SkIntToScalar(50));
         path.lineTo(SkIntToScalar(150), SkIntToScalar(50));
         path.lineTo(SkIntToScalar(150), SkIntToScalar(125));
         path.quadTo(SkIntToScalar(150), SkIntToScalar(150), SkIntToScalar(125), SkIntToScalar(150));
         path.lineTo(SkIntToScalar(50),  SkIntToScalar(150));
         path.close();
-        path.setFillType(SkPath::kEvenOdd_FillType);
+        if (fInvertDraw) {
+            path.setFillType(SkPath::kInverseEvenOdd_FillType);
+        } else {
+            path.setFillType(SkPath::kEvenOdd_FillType);
+        }
         SkPaint pathPaint;
         pathPaint.setAntiAlias(true);
         pathPaint.setColor(gPathColor);
 
         SkPath clipA;
         clipA.moveTo(SkIntToScalar(10),  SkIntToScalar(20));
         clipA.lineTo(SkIntToScalar(165), SkIntToScalar(22));
         clipA.lineTo(SkIntToScalar(70),  SkIntToScalar(105));
         clipA.lineTo(SkIntToScalar(165), SkIntToScalar(177));
         clipA.lineTo(SkIntToScalar(-5),  SkIntToScalar(180));
@@ skipping 53 matching lines @@
                 bool doInvB = SkToBool(invBits & 2);
                 canvas->save();
                     // set clip
                     clipA.setFillType(doInvA ? SkPath::kInverseEvenOdd_FillType :
                                       SkPath::kEvenOdd_FillType);
                     clipB.setFillType(doInvB ? SkPath::kInverseEvenOdd_FillType :
                                       SkPath::kEvenOdd_FillType);
                     canvas->clipPath(clipA, SkRegion::kIntersect_Op, fDoAAClip);
                     canvas->clipPath(clipB, gOps[op].fOp, fDoAAClip);
 
+                    // In the inverse case we need to prevent the draw from covering the whole
+                    // canvas.
+                    if (fInvertDraw) {
+                        SkRect rectClip = clipA.getBounds();
+                        rectClip.join(path.getBounds());
+                        rectClip.join(path.getBounds());
+                        rectClip.outset(5, 5);
+                        canvas->clipRect(rectClip);
+                    }
+
                     // draw path clipped
                     canvas->drawPath(path, pathPaint);
                 canvas->restore();
 
 
                 SkScalar txtX = SkIntToScalar(45);
                 paint.setColor(gClipAColor);
                 const char* aTxt = doInvA ? "InvA " : "A ";
                 canvas->drawText(aTxt, strlen(aTxt), txtX, SkIntToScalar(220), paint);
                 txtX += paint.measureText(aTxt, strlen(aTxt));
@@ skipping 27 matching lines @@
         paint.setColor(gPathColor); paint.setAlpha(fade);
         canvas->drawPath(path, paint);
 
         // draw clips in hair line
         paint.setColor(gClipAColor); paint.setAlpha(fade);
         canvas->drawPath(clipA, paint);
         paint.setColor(gClipBColor); paint.setAlpha(fade);
         canvas->drawPath(clipB, paint);
     }
 
+    bool fDoAAClip;
+    bool fDoSaveLayer;
+    bool fInvertDraw;
+
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
-// aliased and anti-aliased w/o a layer
-static GM* gFact0(void*) { return new ComplexClipGM(false, false); }
-static GM* gFact1(void*) { return new ComplexClipGM(true, false); }
-
-// aliased and anti-aliased w/ a layer
-static GM* gFact2(void*) { return new ComplexClipGM(false, true); }
-static GM* gFact3(void*) { return new ComplexClipGM(true, true); }
-
-static GMRegistry gReg0(gFact0);
-static GMRegistry gReg1(gFact1);
-static GMRegistry gReg2(gFact2);
-static GMRegistry gReg3(gFact3);
+DEF_GM( return SkNEW_ARGS(ComplexClipGM, (false, false, false)); )
+DEF_GM( return SkNEW_ARGS(ComplexClipGM, (false, false, true));  )
+DEF_GM( return SkNEW_ARGS(ComplexClipGM, (false, true,  false)); )
+DEF_GM( return SkNEW_ARGS(ComplexClipGM, (false, true,  true));  )
+DEF_GM( return SkNEW_ARGS(ComplexClipGM, (true,  false, false)); )
+DEF_GM( return SkNEW_ARGS(ComplexClipGM, (true,  false, true));  )
+DEF_GM( return SkNEW_ARGS(ComplexClipGM, (true,  true,  false)); )
+DEF_GM( return SkNEW_ARGS(ComplexClipGM, (true,  true,  true));  )
 
 }