commit 30182b482b6eeae83c658d528804d9e95f4151d3
author Brian Salomon <bsalomon@google.com> Tue Apr 16 13:20:08 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Apr 16 17:52:38 2019 +0000
tree 7f0b27a4c81a7990d3d71473610ee660862b324b
parent 393981d1db3ffcb5f1c013f5d9ec160fc52b89c4

Ensure that insetting for blur texture domain doesn't invert domain rect.

Bug: chromium:949422
Change-Id: I9046ee89f5cfb56fc25c50bd3b9bd617f07a3a73
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/208514
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/core/SkGpuBlurUtils.cpp

diff --git a/src/core/SkGpuBlurUtils.cpp b/src/core/SkGpuBlurUtils.cpp
index a1b5b20..c3d4b24 100644
--- a/src/core/SkGpuBlurUtils.cpp
+++ b/src/core/SkGpuBlurUtils.cpp
@@ -321,6 +321,13 @@
             SkRect domain = SkRect::Make(*contentRect);
             domain.inset((i < scaleFactorX) ? SK_ScalarHalf + SK_ScalarNearlyZero : 0.0f,
                          (i < scaleFactorY) ? SK_ScalarHalf + SK_ScalarNearlyZero : 0.0f);
+            // Ensure that the insetting doesn't invert the domain rectangle.
+            if (domain.fRight < domain.fLeft) {
+                domain.fLeft = domain.fRight = SkScalarAve(domain.fLeft, domain.fRight);
+            }
+            if (domain.fBottom < domain.fTop) {
+                domain.fTop = domain.fBottom = SkScalarAve(domain.fTop, domain.fBottom);
+            }
             auto fp = GrTextureDomainEffect::Make(std::move(src),
                                                   SkMatrix::I(),
                                                   domain,