From c401b235729f02574aa99b8059162969d3986101 Mon Sep 17 00:00:00 2001
From: Nader Jawad <njawad@google.com>
Date: Fri, 21 May 2021 12:52:05 -0700
Subject: [PATCH] Fixed issue where layers were not always used

Fixed issue where requiresLayer logic was filtering
on the type of stretch behavior when it should no
longer be the case in order to maintain consistent
rendering behavior across stretch behaviors

Fixes: 188923672
Test: Added HWUI StretchEffect test
Change-Id: Ief4f010949b97302bd2d71f26f0f892c8e7f374f
---
 libs/hwui/Android.bp                        |  1 +
 libs/hwui/effects/StretchEffect.h           |  3 +-
 libs/hwui/tests/unit/StretchEffectTests.cpp | 61 +++++++++++++++++++++
 3 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 libs/hwui/tests/unit/StretchEffectTests.cpp

diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index c6ab8a28ed4c2..d8715dbf76461 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -671,6 +671,7 @@ cc_test {
         "tests/unit/SkiaPipelineTests.cpp",
         "tests/unit/SkiaRenderPropertiesTests.cpp",
         "tests/unit/SkiaCanvasTests.cpp",
+        "tests/unit/StretchEffectTests.cpp",
         "tests/unit/StringUtilsTests.cpp",
         "tests/unit/TestUtilsTests.cpp",
         "tests/unit/ThreadBaseTests.cpp",
diff --git a/libs/hwui/effects/StretchEffect.h b/libs/hwui/effects/StretchEffect.h
index a92ef5bfe6588..64fb2bf7ef188 100644
--- a/libs/hwui/effects/StretchEffect.h
+++ b/libs/hwui/effects/StretchEffect.h
@@ -110,8 +110,7 @@ public:
     }
 
     bool requiresLayer() const {
-        return !(isEmpty() ||
-                 Properties::getStretchEffectBehavior() == StretchEffectBehavior::UniformScale);
+        return !isEmpty();
     }
 
 private:
diff --git a/libs/hwui/tests/unit/StretchEffectTests.cpp b/libs/hwui/tests/unit/StretchEffectTests.cpp
new file mode 100644
index 0000000000000..f5e20a1d11c63
--- /dev/null
+++ b/libs/hwui/tests/unit/StretchEffectTests.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+#include <effects/StretchEffect.h>
+#include "tests/common/TestUtils.h"
+#include "Properties.h"
+
+using namespace android;
+using namespace android::uirenderer;
+
+TEST(StretchEffect, noStretchDirectionDoesNotRequireLayer) {
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::ShaderHWUI);
+  auto stretchEffect = StretchEffect({.fX = 0.f, .fY = 0.f}, 100.f, 100.f);
+  ASSERT_FALSE(stretchEffect.requiresLayer());
+
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::UniformScale);
+  ASSERT_FALSE(stretchEffect.requiresLayer());
+}
+
+TEST(StretchEffect, horizontalStretchRequiresLayer) {
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::ShaderHWUI);
+  auto stretchEffect = StretchEffect({.fX = 1.f, .fY = 0.f}, 100.f, 100.f);
+  ASSERT_TRUE(stretchEffect.requiresLayer());
+
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::UniformScale);
+  ASSERT_TRUE(stretchEffect.requiresLayer());
+}
+
+TEST(StretchEffect, verticalStretchRequiresLayer) {
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::ShaderHWUI);
+
+  auto stretchEffect = StretchEffect({.fX = 0.f, .fY = 1.f}, 100.f, 100.f);
+  ASSERT_TRUE(stretchEffect.requiresLayer());
+
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::UniformScale);
+  ASSERT_TRUE(stretchEffect.requiresLayer());
+}
+
+TEST(StretchEffect, bidirectionalStretchRequiresLayer) {
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::ShaderHWUI);
+
+  auto stretchEffect = StretchEffect({.fX = 1.f, .fY = 1.f}, 100.f, 100.f);
+  ASSERT_TRUE(stretchEffect.requiresLayer());
+
+  Properties::setStretchEffectBehavior(StretchEffectBehavior::UniformScale);
+  ASSERT_TRUE(stretchEffect.requiresLayer());
+}
\ No newline at end of file