remove unused clip parameter to SkEdge::setClip

src/core/SkEdge.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkEdge.h"
@@ skipping 314 matching lines @@
     use 16/512 to approximate 1/27
 */
 static SkFDot6 cubic_delta_from_line(SkFDot6 a, SkFDot6 b, SkFDot6 c, SkFDot6 d)
 {
     SkFDot6 oneThird = ((a << 3) - ((b << 4) - b) + 6*c + d) * 19 >> 9;
     SkFDot6 twoThird = (a + 6*b - ((c << 4) - c) + (d << 3)) * 19 >> 9;
 
     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;
 
     {
 #ifdef SK_RASTERIZE_EVEN_ROUNDING
         x0 = SkScalarRoundToFDot6(pts[0].fX, shift);
         y0 = SkScalarRoundToFDot6(pts[0].fY, shift);
         x1 = SkScalarRoundToFDot6(pts[1].fX, shift);
         y1 = SkScalarRoundToFDot6(pts[1].fY, shift);
         x2 = SkScalarRoundToFDot6(pts[2].fX, shift);
         y2 = SkScalarRoundToFDot6(pts[2].fY, shift);
@@ skipping 22 matching lines @@
         winding = -1;
     }
 
     int top = SkFDot6Round(y0);
     int bot = SkFDot6Round(y3);
 
     // are we a zero-height cubic (line)?
     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
         // need not be the max delta from the baseline (it could even be coincident)
         // so we try just looking at the two off-curve points
         SkFDot6 dx = cubic_delta_from_line(x0, x1, x2, x3);
         SkFDot6 dy = cubic_delta_from_line(y0, y1, y2, y3);
         // add 1 (by observation)
         shift = diff_to_shift(dx, dy) + 1;
     }
@@ skipping 33 matching lines @@
     D = SkFDot6UpShift(y3 + 3 * (y1 - y2) - y0, upShift);
 
     fCy     = SkFDot6ToFixed(y0);
     fCDy    = B + (C >> shift) + (D >> 2*shift);    // biased by shift
     fCDDy   = 2*C + (3*D >> (shift - 1));           // biased by 2*shift
     fCDDDy  = 3*D >> (shift - 1);                   // biased by 2*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();
 }
 
 int SkCubicEdge::updateCubic()
 {
     int     success;
     int     count = fCurveCount;
     SkFixed oldx = fCx;
     SkFixed oldy = fCy;
     SkFixed newx, newy;
@@ skipping 29 matching lines @@
         success = this->updateLine(oldx, oldy, newx, newy);
         oldx = newx;
         oldy = newy;
     } while (count < 0 && !success);
 
     fCx         = newx;
     fCy         = newy;
     fCurveCount = SkToS8(count);
     return success;
 }