Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(249)

Side by Side Diff: src/core/SkPath.cpp

Issue 832083002: Cleanup isRect variants (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Improve comments Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include/core/SkPath.h ('k') | tests/PathTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkBuffer.h" 8 #include "SkBuffer.h"
9 #include "SkErrorInternals.h" 9 #include "SkErrorInternals.h"
10 #include "SkGeometry.h" 10 #include "SkGeometry.h"
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 *direction = firstDirection == ((lastDirection + 1) & 3) ? kCCW_Directio n : kCW_Direction; 524 *direction = firstDirection == ((lastDirection + 1) & 3) ? kCCW_Directio n : kCW_Direction;
525 } 525 }
526 return result; 526 return result;
527 } 527 }
528 528
529 SkPath::PathAsRect SkPath::asRect(Direction* direction) const { 529 SkPath::PathAsRect SkPath::asRect(Direction* direction) const {
530 SK_COMPILE_ASSERT(0 == kNone_PathAsRect, path_as_rect_mismatch); 530 SK_COMPILE_ASSERT(0 == kNone_PathAsRect, path_as_rect_mismatch);
531 SK_COMPILE_ASSERT(1 == kFill_PathAsRect, path_as_rect_mismatch); 531 SK_COMPILE_ASSERT(1 == kFill_PathAsRect, path_as_rect_mismatch);
532 SK_COMPILE_ASSERT(2 == kStroke_PathAsRect, path_as_rect_mismatch); 532 SK_COMPILE_ASSERT(2 == kStroke_PathAsRect, path_as_rect_mismatch);
533 bool isClosed = false; 533 bool isClosed = false;
534 return (PathAsRect) (isRect(&isClosed, direction) + isClosed); 534 return (PathAsRect) (this->isRect(NULL, &isClosed, direction) + isClosed);
535 } 535 }
536 536
537 bool SkPath::isRect(SkRect* rect, bool* isClosed, Direction* direction) const { 537 bool SkPath::isRect(SkRect* rect, bool* isClosed, Direction* direction) const {
538 SkDEBUGCODE(this->validate();) 538 SkDEBUGCODE(this->validate();)
539 int currVerb = 0; 539 int currVerb = 0;
540 const SkPoint* pts = fPathRef->points(); 540 const SkPoint* pts = fPathRef->points();
541 const SkPoint* first = pts; 541 const SkPoint* first = pts;
542 if (!this->isRectContour(false, &currVerb, &pts, isClosed, direction)) { 542 if (!this->isRectContour(false, &currVerb, &pts, isClosed, direction)) {
543 return false; 543 return false;
544 } 544 }
(...skipping 2395 matching lines...) Expand 10 before | Expand all | Expand 10 after
2940 switch (this->getFillType()) { 2940 switch (this->getFillType()) {
2941 case SkPath::kEvenOdd_FillType: 2941 case SkPath::kEvenOdd_FillType:
2942 case SkPath::kInverseEvenOdd_FillType: 2942 case SkPath::kInverseEvenOdd_FillType:
2943 w &= 1; 2943 w &= 1;
2944 break; 2944 break;
2945 default: 2945 default:
2946 break; 2946 break;
2947 } 2947 }
2948 return SkToBool(w); 2948 return SkToBool(w);
2949 } 2949 }
OLDNEW
« no previous file with comments | « include/core/SkPath.h ('k') | tests/PathTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698