summaryrefslogtreecommitdiff
path: root/layout/generic
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-10-20 09:52:16 +0000
committerMoonchild <moonchild@palemoon.org>2020-10-20 09:52:16 +0000
commitb16bffb9cf67510ad9ebc7d562387c7219d413c9 (patch)
treed6d3ab0488946079b8273cec1589c33e9721e039 /layout/generic
parentfe57f39a18340dd6049edaac729e8d70ed97de16 (diff)
parentd3e142f195452586e1f6ffaa66425a52263b984c (diff)
downloadaura-central-b16bffb9cf67510ad9ebc7d562387c7219d413c9.tar.gz
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'layout/generic')
-rw-r--r--layout/generic/nsFrame.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 72923c4b7..a9e6354ab 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -1831,8 +1831,7 @@ nsIFrame::DisplayCaret(nsDisplayListBuilder* aBuilder,
nscolor
nsIFrame::GetCaretColorAt(int32_t aOffset)
{
- // Use text color.
- return StyleColor()->mColor;
+ return nsLayoutUtils::GetColor(this, eCSSProperty_caret_color);
}
bool