diff options
| author |  sugoi@google.com <sugoi@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-06 20:13:11 +0000 |
|---|---|---|
| committer | sugoi@google.com <sugoi@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-06 20:13:11 +0000 |
| commit | 12b4e27ae1a29460e91a59f38122483e1faec697 (patch) | |
| tree | ed783f409c707e748cd0db8c635a6e97d328886d /src/core | |
| parent | df6fe603a592be6495a61b4ad2e8b8fad452c2ac (diff) | |
As part of preliminary groundwork for a chromium fix, this changelist is deprecating GrPathFill so that SkPath::FillType is used everywhere in order to remove some code duplication between Skia and Ganesh.
BUG=chromium:135111
TEST=Try path rendering tests from the gm
Review URL: https://codereview.appspot.com/6875058
git-svn-id: http://skia.googlecode.com/svn/trunk@6693 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkPath.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkStroke.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp index 80ca3011e3..fe9551492d 100644 --- a/src/core/SkPath.cpp +++ b/src/core/SkPath.cpp @@ -576,7 +576,7 @@ bool SkPath::isRectContour(bool allowPartial, int* currVerb, const SkPoint** pts *isClosed = autoClose; } if (result && direction) { - *direction = firstDirection == (lastDirection + 1 & 3) ? kCCW_Direction : kCW_Direction; + *direction = firstDirection == ((lastDirection + 1) & 3) ? kCCW_Direction : kCW_Direction; } return result; } diff --git a/src/core/SkStroke.h b/src/core/SkStroke.h index 48805165cb..33a7ecba5c 100644 --- a/src/core/SkStroke.h +++ b/src/core/SkStroke.h @@ -32,6 +32,7 @@ public: void setMiterLimit(SkScalar); void setWidth(SkScalar); + SkScalar getWidthIfStroked() const { return fDoFill ? -SK_Scalar1 : fWidth; } bool getDoFill() const { return SkToBool(fDoFill); } void setDoFill(bool doFill) { fDoFill = SkToU8(doFill); } |