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
commitb273afd2e736f285cc9d8c41da95a0ef3ba1d15b (patch)
treed6d3ab0488946079b8273cec1589c33e9721e039 /layout/generic
parentfbfe2ed58f6977e3f0f464040796db62e7393057 (diff)
parent094355467b9c658054a277ee4033f78262ea28cc (diff)
downloaduxp-b273afd2e736f285cc9d8c41da95a0ef3ba1d15b.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 72923c4b7f..a9e6354abe 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