commit e4b8b5283f45cff6a490ee73677f75b641c22bd1
author Yuqian Li <liyuqian@google.com> Wed Nov 16 10:12:58 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 16 15:55:50 2016 +0000
tree d502bbfd21deb19c814b7afac41c28463f4d3ccc
parent 08576e618883c3f8eb2cdf425e2f2bd7842f3f2e

Simplify the signature of sk/aaa_fill_path

Previously, the clipRect is either equal to nullptr or clipRgn's bound
(after necessary supersampling shift). Hence we drop one of them to make
the signature simpler.

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4874

Change-Id: Ied8d5313809d6cf90374365b01f2b8d52f2236e2
Reviewed-on: https://skia-review.googlesource.com/4874
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Yuqian Li <liyuqian@google.com>

src/core/SkScanPriv.h

diff --git a/src/core/SkScanPriv.h b/src/core/SkScanPriv.h
index 4ff91bb..4c237e0 100644
--- a/src/core/SkScanPriv.h
+++ b/src/core/SkScanPriv.h
@@ -30,10 +30,13 @@
     const SkIRect*      fClipRect;
 };
 
-// clipRect == null means path is entirely inside the clip
-void sk_fill_path(const SkPath& path, const SkIRect* clipRect,
+void sk_fill_path(const SkPath& path, const SkIRect& clipRect,
                   SkBlitter* blitter, int start_y, int stop_y, int shiftEdgesUp,
-                  const SkRegion& clipRgn);
+                  bool pathContainedInClip);
+
+void aaa_fill_path(const SkPath& path, const SkIRect& clipRect, AdditiveBlitter*,
+                   int start_y, int stop_y, bool pathContainedInClip, bool isUsingMask,
+                   bool forceRLE);
 
 // blit the rects above and below avoid, clipped to clip
 void sk_blit_above(SkBlitter*, const SkIRect& avoid, const SkRegion& clip);