Revert r9724 (add rect-output parameter to isRect) to allow the DEPS roll
git-svn-id: http://skia.googlecode.com/svn/trunk@9750 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 35f4772..e997b80 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -584,19 +584,22 @@
return result;
}
-bool SkPath::isRect(SkRect* rect, bool* isClosed, Direction* direction) const {
+bool SkPath::isRect(SkRect* rect) const {
SkDEBUGCODE(this->validate();)
int currVerb = 0;
const SkPoint* pts = fPathRef->points();
- const SkPoint* first = pts;
- if (!this->isRectContour(false, &currVerb, &pts, isClosed, direction)) {
- return false;
+ bool result = isRectContour(false, &currVerb, &pts, NULL, NULL);
+ if (result && rect) {
+ *rect = getBounds();
}
+ return result;
+}
- if (rect) {
- rect->set(first, SkToS32(pts - first));
- }
- return true;
+bool SkPath::isRect(bool* isClosed, Direction* direction) const {
+ SkDEBUGCODE(this->validate();)
+ int currVerb = 0;
+ const SkPoint* pts = fPathRef->points();
+ return isRectContour(false, &currVerb, &pts, isClosed, direction);
}
bool SkPath::isNestedRects(SkRect rects[2], Direction dirs[2]) const {