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

Merge "Use new SkAndroidFrameworkUtils method to get linear gradient info."

Browse Source
This commit is contained in:
Brian Salomon
2022-10-25 14:36:13 +00:00
committed by Android (Google) Code Review
parent 1178705e53 bb2499f268
commit 64379f2372
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libs/hwui/CanvasTransform.cpp
View File

@@ -15,19 +15,20 @@
*/
#include "CanvasTransform.h"
#include "Properties.h"
#include "utils/Color.h"
#include <SkAndroidFrameworkUtils.h>
#include <SkColorFilter.h>
#include <SkGradientShader.h>
#include <SkHighContrastFilter.h>
#include <SkPaint.h>
#include <SkShader.h>
#include <log/log.h>
#include <algorithm>
#include <cmath>
#include <log/log.h>
#include <SkHighContrastFilter.h>
#include "Properties.h"
#include "utils/Color.h"
namespace android::uirenderer {
@@ -82,27 +83,21 @@ static void applyColorTransform(ColorTransform transform, SkPaint& paint) {
paint.setColor(newColor);
if (paint.getShader()) {
SkShader::GradientInfo info;
SkAndroidFrameworkUtils::LinearGradientInfo info;
std::array<SkColor, 10> _colorStorage;
std::array<SkScalar, _colorStorage.size()> _offsetStorage;
info.fColorCount = _colorStorage.size();
info.fColors = _colorStorage.data();
info.fColorOffsets = _offsetStorage.data();
SkShader::GradientType type = paint.getShader()->asAGradient(&info);
if (info.fColorCount <= 10) {
switch (type) {
case SkShader::kLinear_GradientType:
for (int i = 0; i < info.fColorCount; i++) {
info.fColors[i] = transformColor(transform, info.fColors[i]);
}
paint.setShader(SkGradientShader::MakeLinear(info.fPoint, info.fColors,
info.fColorOffsets, info.fColorCount,
info.fTileMode, info.fGradientFlags, nullptr));
break;
default:break;
if (SkAndroidFrameworkUtils::ShaderAsALinearGradient(paint.getShader(), &info) &&
info.fColorCount <= _colorStorage.size()) {
for (int i = 0; i < info.fColorCount; i++) {
info.fColors[i] = transformColor(transform, info.fColors[i]);
}
paint.setShader(SkGradientShader::MakeLinear(
info.fPoints, info.fColors, info.fColorOffsets, info.fColorCount,
info.fTileMode, info.fGradientFlags, nullptr));
}
}