Update stroke path to use rect returned from isRect (to fix trailing moveTo bug)

gm/strokefill.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 "SkPath.h"
@@ skipping 61 matching lines @@
         path2.reset();
         path2.addCircle(x + SkIntToScalar(240), y + SkIntToScalar(200), SkIntToScalar(50), SkPath::kCCW_Direction);
         canvas->drawPath(path2, paint);
         SkASSERT(path2.cheapIsDirection(SkPath::kCCW_Direction));
 
         path2.reset();
         SkASSERT(!path2.cheapComputeDirection(NULL));
         path2.addCircle(x + SkIntToScalar(360), y + SkIntToScalar(200), SkIntToScalar(50), SkPath::kCW_Direction);
         SkASSERT(path2.cheapIsDirection(SkPath::kCW_Direction));
         canvas->drawPath(path2, paint);
+
+        SkRect r = SkRect::MakeXYWH(x - SkIntToScalar(50), y + SkIntToScalar(280),
+                                    SkIntToScalar(100), SkIntToScalar(100));
+        SkPath path3;
+        path3.setFillType(SkPath::kWinding_FillType);
+        path3.addRect(r, SkPath::kCW_Direction);
+        r.inset(SkIntToScalar(10), SkIntToScalar(10));
+        path3.addRect(r, SkPath::kCCW_Direction);
+        canvas->drawPath(path3, paint);
+
+        r = SkRect::MakeXYWH(x + SkIntToScalar(70), y + SkIntToScalar(280), 
+                             SkIntToScalar(100), SkIntToScalar(100));
+        SkPath path4;
+        path4.setFillType(SkPath::kWinding_FillType);
+        path4.addRect(r, SkPath::kCCW_Direction);
+        r.inset(SkIntToScalar(10), SkIntToScalar(10));
+        path4.addRect(r, SkPath::kCW_Direction);
+        canvas->drawPath(path4, paint);
+
+        r = SkRect::MakeXYWH(x + SkIntToScalar(190), y + SkIntToScalar(280), 
+                             SkIntToScalar(100), SkIntToScalar(100));
+        path4.reset();
+        SkASSERT(!path4.cheapComputeDirection(NULL));
+        path4.addRect(r, SkPath::kCCW_Direction);
+        SkASSERT(path4.cheapIsDirection(SkPath::kCCW_Direction));
+        path4.moveTo(0, 0); // test for crbug.com/247770
+        canvas->drawPath(path4, paint);
+
+        r = SkRect::MakeXYWH(x + SkIntToScalar(310), y + SkIntToScalar(280), 
+                             SkIntToScalar(100), SkIntToScalar(100));
+        path4.reset();
+        SkASSERT(!path4.cheapComputeDirection(NULL));
+        path4.addRect(r, SkPath::kCW_Direction);
+        SkASSERT(path4.cheapIsDirection(SkPath::kCW_Direction));
+        path4.moveTo(0, 0); // test for crbug.com/247770
+        canvas->drawPath(path4, paint);
     }
 
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new StrokeFillGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM(return SkNEW(StrokeFillGM);)
 
 }