| Index: src/core/SkEdge.cpp
|
| diff --git a/src/core/SkEdge.cpp b/src/core/SkEdge.cpp
|
| index 11d954e63ff106e2cba6b7cb95bd4517e09d1944..f91f5f87829c45cd221dcefecfe00f6091f8f0e4 100644
|
| --- a/src/core/SkEdge.cpp
|
| +++ b/src/core/SkEdge.cpp
|
| @@ -332,8 +332,7 @@ static SkFDot6 cubic_delta_from_line(SkFDot6 a, SkFDot6 b, SkFDot6 c, SkFDot6 d)
|
| return SkMax32(SkAbs32(oneThird), SkAbs32(twoThird));
|
| }
|
|
|
| -int SkCubicEdge::setCubic(const SkPoint pts[4], const SkIRect* clip, int shift)
|
| -{
|
| +int SkCubicEdge::setCubic(const SkPoint pts[4], int shift) {
|
| SkFDot6 x0, y0, x1, y1, x2, y2, x3, y3;
|
|
|
| {
|
| @@ -376,10 +375,6 @@ int SkCubicEdge::setCubic(const SkPoint pts[4], const SkIRect* clip, int shift)
|
| if (top == bot)
|
| return 0;
|
|
|
| - // are we completely above or below the clip?
|
| - if (clip && (top >= clip->fBottom || bot <= clip->fTop))
|
| - return 0;
|
| -
|
| // compute number of steps needed (1 << shift)
|
| {
|
| // Can't use (center of curve - center of baseline), since center-of-curve
|
| @@ -433,16 +428,6 @@ int SkCubicEdge::setCubic(const SkPoint pts[4], const SkIRect* clip, int shift)
|
| fCLastX = SkFDot6ToFixed(x3);
|
| fCLastY = SkFDot6ToFixed(y3);
|
|
|
| - if (clip)
|
| - {
|
| - do {
|
| - if (!this->updateCubic()) {
|
| - return 0;
|
| - }
|
| - } while (!this->intersectsClip(*clip));
|
| - this->chopLineWithClip(*clip);
|
| - return 1;
|
| - }
|
| return this->updateCubic();
|
| }
|
|
|
|
|