Bug 1786050 - Normalize color-line if endpoints are not [0.0, 1.0] when creating radial gradient. r=gfx-reviewers,lsalzman

Differential Revision: https://phabricator.services.mozilla.com/D155080
This commit is contained in:
Jonathan Kew 2022-08-25 09:46:58 +00:00
Родитель e111b7125f
Коммит 827ef46945
1 изменённых файлов: 33 добавлений и 22 удалений

Просмотреть файл

@ -904,18 +904,38 @@ struct PaintRadialGradient : public PaintPatternBase {
}
const auto* colorLine =
reinterpret_cast<const ColorLine*>(aState.COLRv1BaseAddr() + clOffset);
UniquePtr<Pattern> solidColor = colorLine->AsSolidColor(aState);
if (solidColor) {
return solidColor;
}
RefPtr stops = colorLine->MakeGradientStops(aState);
if (!stops) {
return nullptr;
}
Point c1(aState.F2P(int16_t(x0)), aState.F2P(int16_t(y0)));
Point c2(aState.F2P(int16_t(x1)), aState.F2P(int16_t(y1)));
float r1 = aState.F2P(uint16_t(radius0));
float r2 = aState.F2P(uint16_t(radius1));
return NormalizeAndMakeGradient(aState, colorLine, c1, c2, r1, r2);
}
template <typename T>
UniquePtr<Pattern> NormalizeAndMakeGradient(const PaintState& aState,
const T* aColorLine, Point c1,
Point c2, float r1,
float r2) const {
if ((c1 == c2 && r1 == r2) || (r1 == 0.0 && r2 == 0.0)) {
return MakeUnique<ColorPattern>(DeviceColor());
}
UniquePtr<Pattern> solidColor = aColorLine->AsSolidColor(aState);
if (solidColor) {
return solidColor;
}
float firstStop, lastStop;
RefPtr stops = aColorLine->MakeGradientStops(aState, &firstStop, &lastStop);
if (!stops) {
return nullptr;
}
if (firstStop != 0.0 || lastStop != 1.0) {
Point v = c2 - c1;
c1 += v * firstStop;
c2 -= v * (1.0f - lastStop);
float deltaR = r2 - r1;
r1 = fabsf(r1 + deltaR * firstStop);
r2 = fabsf(r2 - deltaR * (1.0f - lastStop));
}
return MakeUnique<RadialGradientPattern>(c1, c2, r1, r2, std::move(stops),
Matrix::Scaling(1.0, -1.0));
}
@ -935,27 +955,18 @@ struct PaintVarRadialGradient : public PaintRadialGradient {
}
const auto* colorLine = reinterpret_cast<const VarColorLine*>(
aState.COLRv1BaseAddr() + clOffset);
UniquePtr<Pattern> solidColor = colorLine->AsSolidColor(aState);
if (solidColor) {
return solidColor;
}
RefPtr stops = colorLine->MakeGradientStops(aState);
if (!stops) {
return nullptr;
}
Point c1(aState.F2P(ApplyVariation(aState, int16_t(x0), varIndexBase)),
aState.F2P(
ApplyVariation(aState, int16_t(y0), SatAdd(varIndexBase, 1))));
float r1 = aState.F2P(
ApplyVariation(aState, uint16_t(radius0), SatAdd(varIndexBase, 2)));
float r1 = fabsf(aState.F2P(
ApplyVariation(aState, uint16_t(radius0), SatAdd(varIndexBase, 2))));
Point c2(aState.F2P(
ApplyVariation(aState, int16_t(x1), SatAdd(varIndexBase, 3))),
aState.F2P(
ApplyVariation(aState, int16_t(y1), SatAdd(varIndexBase, 4))));
float r2 = aState.F2P(
ApplyVariation(aState, uint16_t(radius1), SatAdd(varIndexBase, 5)));
return MakeUnique<RadialGradientPattern>(c1, c2, r1, r2, std::move(stops),
Matrix::Scaling(1.0, -1.0));
float r2 = fabsf(aState.F2P(
ApplyVariation(aState, uint16_t(radius1), SatAdd(varIndexBase, 5))));
return NormalizeAndMakeGradient(aState, colorLine, c1, c2, r1, r2);
}
};