Reland blitFatAntiRect with guard to avoid overhead in MaskAdditiveBlitter

This results in ~15% (~700ns vs ~600ns) speedup for
path_fill_small_rect bench in 8888 config. Some skps have a lot of stroked
horizontal/vertical lines (e.g., bar charts) so this improvement could
have a great impact there. For example, cereal converts Microsoft word docx
to PNGs on server and the sample docx has a big bar chart. That inspired
this improvement.

Bug: skia:
Change-Id: If191b8beca58c5c08b356b64ffef93d51761fd0a
Reviewed-on: https://skia-review.googlesource.com/50043
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Yuqian Li <liyuqian@google.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/src/core/SkScan_DAAPath.cpp b/src/core/SkScan_DAAPath.cpp
index 9250d02f07..a9195eb085 100644
--- a/src/core/SkScan_DAAPath.cpp
+++ b/src/core/SkScan_DAAPath.cpp
@@ -328,14 +328,9 @@ void SkScan::DAAFillPath(const SkPath& path, const SkRegion& origClip, SkBlitter
         SkIRect clippedIR = ir;
         clippedIR.intersect(clipBounds);
 
-        SkRect rect;
-        if (!isInverse && path.isRect(&rect) && clippedIR.height() >= 3 && clippedIR.width() >= 3) {
-            // The overhead of even constructing SkCoverageDeltaList/Mask is too big. So just blit.
-            bool nonEmpty = rect.intersect(SkRect::Make(clipBounds));
-            SkASSERT(nonEmpty); // do_fill_path should have already handled the empty case
-            if (nonEmpty) {
-                blitter->blitFatAntiRect(rect);
-            }
+        // The overhead of even constructing SkCoverageDeltaList/Mask is too big.
+        // So TryBlitFatAntiRect and return if it's successful.
+        if (TryBlitFatAntiRect(blitter, path, clipBounds)) {
             return;
         }