commit bab3dab722840bf65862b02ac4f15ec79f829d90
author Herb Derby <herb@google.com> Wed Jul 08 10:16:49 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 08 15:40:07 2020 +0000
tree 1cf54a58a353d1aaa40b20d76d078a1608a73cb2
parent bf052fa77a27f6fef0ad26265fda3bc67f58d065

remove unused clipRect for distance field

In the call insertSubRunOpsIntoTarget, the clipRect is always empty
for the distance field case.

Change-Id: Ib17eaae37a153c5b6aa473b2bf31d8b6c985e78f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/301257
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/ops/GrAtlasTextOp.cpp

diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 93aee41..a51c49b 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -133,8 +133,7 @@
                                             const SkPaint& paint,
                                             GrTextBlob::SubRun* subrun,
                                             const SkMatrixProvider& matrixProvider,
-                                            SkPoint drawOrigin,
-                                            const SkIRect& clipRect) {
+                                            SkPoint drawOrigin) {
     GrPaint grPaint;
     GrRecordingContext* context = rtc->priv().getContext();
     const GrColorInfo& colorInfo = rtc->colorInfo();
@@ -170,7 +169,7 @@
                                          subrun,
                                          drawMatrix,
                                          drawOrigin,
-                                         clipRect,
+                                         SkIRect::MakeEmpty(),
                                          drawingColor,
                                          SkPaintPriv::ComputeLuminanceColor(paint),
                                          useGammaCorrectDistanceTable,

src/gpu/ops/GrAtlasTextOp.h

diff --git a/src/gpu/ops/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h
index 50ac357..d6ece3e 100644
--- a/src/gpu/ops/GrAtlasTextOp.h
+++ b/src/gpu/ops/GrAtlasTextOp.h
@@ -49,8 +49,7 @@
             const SkPaint&,
             GrTextBlob::SubRun*,
             const SkMatrixProvider&,
-            SkPoint drawOrigin,
-            const SkIRect& clipRect);
+            SkPoint drawOrigin);
 
     const char* name() const override { return "AtlasTextOp"; }
 

src/gpu/text/GrTextBlob.cpp

diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp
index b847e02..2cc86ea 100644
--- a/src/gpu/text/GrTextBlob.cpp
+++ b/src/gpu/text/GrTextBlob.cpp
@@ -484,12 +484,12 @@
 
     if (this->drawAsDistanceFields()) {
         // TODO: Can we be even smarter based on the dest transfer function?
+        SkASSERT(clipRect.isEmpty());
         return GrAtlasTextOp::MakeDistanceField(target->renderTargetContext(),
                                                 paint,
                                                 this,
                                                 matrixProvider,
-                                                drawOrigin,
-                                                clipRect);
+                                                drawOrigin);
     } else {
         return GrAtlasTextOp::MakeBitmap(target->renderTargetContext(),
                                          paint,