Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp |
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
index c45ebe126090d8488234a29ce3e6f6f678725ff6..4a38dc25695f0d67f23184c863a2a2bb702c0dc0 100644 |
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
@@ -1131,7 +1131,11 @@ void ComputedStyle::updatePropertySpecificDifferences( |
m_rareInheritedData->m_textDecorationSkip != |
other.m_rareInheritedData->m_textDecorationSkip || |
m_rareInheritedData->appliedTextDecorations != |
- other.m_rareInheritedData->appliedTextDecorations)) { |
+ other.m_rareInheritedData->appliedTextDecorations || |
+ m_rareInheritedData->caretColor() != |
+ other.m_rareInheritedData->caretColor() || |
+ m_rareInheritedData->visitedLinkCaretColor() != |
+ other.m_rareInheritedData->visitedLinkCaretColor())) { |
diff.setTextDecorationOrColorChanged(); |
} |
} |
@@ -2075,6 +2079,14 @@ Color ComputedStyle::colorIncludingFallback(int colorProperty, |
visitedLink ? visitedLinkBorderBottomColor() : borderBottomColor(); |
borderStyle = borderBottomStyle(); |
break; |
+ case CSSPropertyCaretColor: { |
+ StyleAutoColor autoColor = |
+ visitedLink ? visitedLinkCaretColor() : caretColor(); |
+ // TODO(rego): We may want to adjust the caret color if it's the same than |
+ // the background to ensure good visibility and contrast. |
+ result = autoColor.isAutoColor() ? StyleColor::currentColor() : autoColor; |
+ break; |
+ } |
case CSSPropertyColor: |
result = visitedLink ? visitedLinkColor() : color(); |
break; |