fix minor error between kStroke_PathAsRect and kFill_PathAsRect in SkPath::asRect

src/core/SkPath.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBuffer.h"
@@ skipping 488 matching lines @@
         *isClosed = autoClose;
     }
     if (result && direction) {
         *direction = firstDirection == ((lastDirection + 1) & 3) ? kCCW_Direction : kCW_Direction;
     }
     return result;
 }
 
 SkPath::PathAsRect SkPath::asRect(Direction* direction) const {
     SK_COMPILE_ASSERT(0 == kNone_PathAsRect, path_as_rect_mismatch);
-    SK_COMPILE_ASSERT(1 == kStroke_PathAsRect, path_as_rect_mismatch);
-    SK_COMPILE_ASSERT(2 == kFill_PathAsRect, path_as_rect_mismatch);
+    SK_COMPILE_ASSERT(1 == kFill_PathAsRect, path_as_rect_mismatch);
+    SK_COMPILE_ASSERT(2 == kStroke_PathAsRect, path_as_rect_mismatch);
     bool isClosed = false;
     return (PathAsRect) (isRect(&isClosed, direction) + isClosed);

[yunchao, 2014/02/08 07:10:48]

kFill_PathAsRect is added for those non-closed paths in SkPath::asRect. this
kind path draws the same as its bounds only if is filled. When it is filled, the
painter will close the path implicitly during rendering. Otherwise, If the path
is closed, it can always draws the same as its bounds(a rect) even it is
stroked, we return kStroke_PathAsRect for closed path.

As a result:
For kFill_PathAsRect paths, the updated isRect() return true, parameter
'isClosed' is false.
For kStroke_PathAsRect paths, the updated isRect() return true, parameter
'isClosed' is true.

So I exchanged kFill_PathAsRect and kStroke_PathAsRect to make it align to the
design logic.

 }
 
 bool SkPath::isRect(SkRect* rect) const {
     SkDEBUGCODE(this->validate();)
     int currVerb = 0;
     const SkPoint* pts = fPathRef->points();
     bool result = isRectContour(false, &currVerb, &pts, NULL, NULL);
     if (result && rect) {
         *rect = getBounds();
     }
@@ skipping 2358 matching lines @@
     switch (this->getFillType()) {
         case SkPath::kEvenOdd_FillType:
         case SkPath::kInverseEvenOdd_FillType:
             w &= 1;
             break;
         default:
             break;
     }
     return SkToBool(w);
 }