remove unused clip parameter to SkEdge::setClip

BUG=skia:

Review URL: https://codereview.chromium.org/1019183002

diff --git a/src/core/SkEdge.cpp b/src/core/SkEdge.cpp
index 11d954e63ff106e2cba6b7cb95bd4517e09d1944..f91f5f87829c45cd221dcefecfe00f6091f8f0e4 100644 (file)
--- 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();
 }
 

diff --git a/src/core/SkEdge.h b/src/core/SkEdge.h
index 09c021c91829357d28e0945c6aa515d6acb129d2..db6f43085dadf88bd4b28cd128a2280d86935d92 100644 (file)
--- a/src/core/SkEdge.h
+++ b/src/core/SkEdge.h
@@ -36,8 +36,7 @@ struct SkEdge {
     uint8_t fCubicDShift;   // applied to fCDx and fCDy only in cubic
     int8_t  fWinding;       // 1 or -1
 
-    int setLine(const SkPoint& p0, const SkPoint& p1, const SkIRect* clip,
-                int shiftUp);
+    int setLine(const SkPoint& p0, const SkPoint& p1, const SkIRect* clip, int shiftUp);
     // call this version if you know you don't have a clip
     inline int setLine(const SkPoint& p0, const SkPoint& p1, int shiftUp);
     inline int updateLine(SkFixed ax, SkFixed ay, SkFixed bx, SkFixed by);
@@ -81,7 +80,7 @@ struct SkCubicEdge : public SkEdge {
     SkFixed fCDDDx, fCDDDy;
     SkFixed fCLastX, fCLastY;
 
-    int setCubic(const SkPoint pts[4], const SkIRect* clip, int shiftUp);
+    int setCubic(const SkPoint pts[4], int shiftUp);
     int updateCubic();
 };
 

diff --git a/src/core/SkEdgeBuilder.cpp b/src/core/SkEdgeBuilder.cpp
index 6a8ea8926aa1f47f6bded526f7b5ba92b6337ad7..43181fdbfcb8721174f42400af6fabb8509b383c 100644 (file)
--- a/src/core/SkEdgeBuilder.cpp
+++ b/src/core/SkEdgeBuilder.cpp
@@ -42,7 +42,7 @@ void SkEdgeBuilder::addQuad(const SkPoint pts[]) {
 
 void SkEdgeBuilder::addCubic(const SkPoint pts[]) {
     SkCubicEdge* edge = typedAllocThrow<SkCubicEdge>(fAlloc);
-    if (edge->setCubic(pts, NULL, fShiftUp)) {
+    if (edge->setCubic(pts, fShiftUp)) {
         fList.push(edge);
     } else {
         // TODO: unallocate edge from storage...