Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed issue where layers were not always used" into sc-dev am: 0b7205bf9c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14682103

Change-Id: I0d70ff95f07d3cbbeaaf9bdb761dad010e21a00e
This commit is contained in:
Nader Jawad
2021-05-21 23:55:13 +00:00
committed by Automerger Merge Worker
parent 6399316a1e 0b7205bf9c
commit 7cfaa715c2
3 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/hwui/Android.bp
View File

@@ -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",

3
libs/hwui/effects/StretchEffect.h
View File

@@ -110,8 +110,7 @@ public:
}
bool requiresLayer() const {
return !(isEmpty() ||
Properties::getStretchEffectBehavior() == StretchEffectBehavior::UniformScale);
return !isEmpty();
}
private:

61
libs/hwui/tests/unit/StretchEffectTests.cpp Normal file
View File

@@ -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());
}