fix minor error between kStroke_PathAsRect and kFill_PathAsRect in SkPath::asRect
R=caryclark@google.com, reed@google.com
Author: yunchao.he@intel.com
Review URL: https://codereview.chromium.org/138703008
git-svn-id: http://skia.googlecode.com/svn/trunk@13390 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/core/SkPath.h b/include/core/SkPath.h
index 2d63bb2..5e31e28 100644
--- a/include/core/SkPath.h
+++ b/include/core/SkPath.h
@@ -558,10 +558,10 @@
enum PathAsRect {
/** The path can not draw the same as its bounds. */
kNone_PathAsRect,
- /** The path draws the same as its bounds when stroked or filled. */
- kStroke_PathAsRect,
/** The path draws the same as its bounds when filled. */
kFill_PathAsRect,
+ /** The path draws the same as its bounds when stroked or filled. */
+ kStroke_PathAsRect,
};
/** Returns kFill_PathAsRect or kStroke_PathAsRect if drawing the path (either filled or
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index d3f493d..5023d60 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -500,8 +500,8 @@
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);
}
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index e872b0c..f9466f5 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -1443,7 +1443,7 @@
REPORTER_ASSERT(reporter, path.isRect(NULL, NULL));
REPORTER_ASSERT(reporter, path.isRect(&isClosed, NULL));
REPORTER_ASSERT(reporter, isClosed);
- REPORTER_ASSERT(reporter, SkPath::kFill_PathAsRect == path.asRect(NULL));
+ REPORTER_ASSERT(reporter, SkPath::kStroke_PathAsRect == path.asRect(NULL));
}
// Simple isRect test is inline TestPath, below.
@@ -1562,7 +1562,7 @@
REPORTER_ASSERT(reporter, isClosed == tests[testIndex].fClose);
REPORTER_ASSERT(reporter, direction == cheapDirection);
direction = (SkPath::Direction) -1;
- if (tests[testIndex].fClose) {
+ if (!tests[testIndex].fClose) {
REPORTER_ASSERT(reporter, SkPath::kFill_PathAsRect == path.asRect());
REPORTER_ASSERT(reporter, SkPath::kFill_PathAsRect == path.asRect(&direction));
} else {