corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1917715 - Rename nsLayoutUtils::GetColor. r=longsonr,dholbert

Browse Source 
It's suitable for foreground colors only.

Differential Revision: https://phabricator.services.mozilla.com/D221557
This commit is contained in:
Emilio Cobos Álvarez
2024-09-09 23:12:05 +00:00
parent 6abe188b20
commit 3ca9c49882
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
layout/generic/nsTextFrame.cpp
View File

@@ -4883,8 +4883,8 @@ void nsTextFrame::GetTextDecorations(
// This handles the <a href="blah.html"><font color="green">La
// la la</font></a> case. The link underline should be green.
useOverride = true;
overrideColor =
nsLayoutUtils::GetColor(f, &nsStyleTextReset::mTextDecorationColor);
overrideColor = nsLayoutUtils::GetTextColor(
f, &nsStyleTextReset::mTextDecorationColor);
}
nsBlockFrame* fBlock = do_QueryFrame(f);
@@ -4938,11 +4938,11 @@ void nsTextFrame::GetTextDecorations(
// for SVG text, and have e.g. text-decoration-color:red to
// override the fill paint of the decoration.
color = aColorResolution == eResolvedColors
? nsLayoutUtils::GetColor(f, &nsStyleSVG::mFill)
? nsLayoutUtils::GetTextColor(f, &nsStyleSVG::mFill)
: NS_SAME_AS_FOREGROUND_COLOR;
} else {
color =
nsLayoutUtils::GetColor(f, &nsStyleTextReset::mTextDecorationColor);
color = nsLayoutUtils::GetTextColor(
f, &nsStyleTextReset::mTextDecorationColor);
}
bool swapUnderlineAndOverline =
@@ -6538,7 +6538,7 @@ void nsTextFrame::DrawEmphasisMarks(gfxContext* aContext, WritingMode aWM,
nscolor color =
aDecorationOverrideColor
? *aDecorationOverrideColor
: nsLayoutUtils::GetColor(this, &nsStyleText::mTextEmphasisColor);
: nsLayoutUtils::GetTextColor(this, &nsStyleText::mTextEmphasisColor);
aContext->SetColor(sRGBColor::FromABGR(color));
gfx::Point pt;
if (!isTextCombined) {