commit 1131b659f65f0840720ad475725ac91df4957774
author Brian Salomon <bsalomon@google.com> Thu Oct 15 17:13:34 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 16 13:18:53 2020 +0000
tree 08daac6f5caef88b8142845b9104e4bdf8d52cea
parent fd74ac6498c418497e971a4441ba6b94c1a8bb4a

Reenable circle blur fast path for ellipse that transforms to circle

Bug: chromium:1132617
Change-Id: Id9ecc22dfd1720195e0753cfc2b0897fe09dc2ae
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327378
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/core/SkBlurMF.cpp

diff --git a/src/core/SkBlurMF.cpp b/src/core/SkBlurMF.cpp
index 55581ff..48e1601 100644
--- a/src/core/SkBlurMF.cpp
+++ b/src/core/SkBlurMF.cpp
@@ -713,21 +713,33 @@
 
     std::unique_ptr<GrFragmentProcessor> fp;
 
+    SkRRect devRRect;
+    bool devRRectIsValid = srcRRect.transform(viewMatrix, &devRRect);
+
+    bool devRRectIsCircle = devRRectIsValid && SkRRectPriv::IsCircle(devRRect);
+
     bool canBeRect = srcRRect.isRect() && viewMatrix.preservesRightAngles();
-    bool canBeCircle = SkRRectPriv::IsCircle(srcRRect) && viewMatrix.isSimilarity();
+    bool canBeCircle = (SkRRectPriv::IsCircle(srcRRect) && viewMatrix.isSimilarity()) ||
+                       devRRectIsCircle;
+
     if (canBeRect || canBeCircle) {
         if (canBeRect) {
             fp = GrRectBlurEffect::Make(
                     /*inputFP=*/nullptr, context, *context->priv().caps()->shaderCaps(),
                     srcRRect.rect(), viewMatrix, xformedSigma);
         } else {
-            SkPoint center = {srcRRect.getBounds().centerX(), srcRRect.getBounds().centerY()};
-            viewMatrix.mapPoints(&center, 1);
-            SkScalar radius = viewMatrix.mapVector(0, srcRRect.width()/2.f).length();
-            SkRect devBounds = {center.x() - radius,
-                                center.y() - radius,
-                                center.x() + radius,
-                                center.y() + radius};
+            SkRect devBounds;
+            if (devRRectIsCircle) {
+                devBounds = devRRect.getBounds();
+            } else {
+                SkPoint center = {srcRRect.getBounds().centerX(), srcRRect.getBounds().centerY()};
+                viewMatrix.mapPoints(&center, 1);
+                SkScalar radius = viewMatrix.mapVector(0, srcRRect.width()/2.f).length();
+                devBounds = {center.x() - radius,
+                             center.y() - radius,
+                             center.x() + radius,
+                             center.y() + radius};
+            }
             fp = GrCircleBlurFragmentProcessor::Make(/*inputFP=*/nullptr, context, devBounds,
                                                      xformedSigma);
         }
@@ -760,8 +772,7 @@
     if (!viewMatrix.isScaleTranslate()) {
         return false;
     }
-    SkRRect devRRect;
-    if (!srcRRect.transform(viewMatrix, &devRRect) || !SkRRectPriv::AllCornersCircular(devRRect)) {
+    if (!devRRectIsValid || !SkRRectPriv::AllCornersCircular(devRRect)) {
         return false;
     }