[css-ui] Update resolved value of caret-color property

third_party/WebKit/Source/core/editing/EditingStyle.cpp

 /*
  * Copyright (C) 2007, 2008, 2009 Apple Computer, Inc.
  * Copyright (C) 2010, 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 469 matching lines @@
   if (propertiesToInclude == EditingPropertiesInEffect) {
     if (const CSSValue* value = backgroundColorValueInEffect(node))
       m_mutableStyle->setProperty(CSSPropertyBackgroundColor, value->cssText());
     if (const CSSValue* value = computedStyleAtPosition->getPropertyCSSValue(
             CSSPropertyWebkitTextDecorationsInEffect))
       m_mutableStyle->setProperty(CSSPropertyTextDecoration, value->cssText());
   }
 
   if (node && node->ensureComputedStyle()) {
     const ComputedStyle* computedStyle = node->ensureComputedStyle();
-    removeTextFillAndStrokeColorsIfNeeded(computedStyle);
+    removeInheritedColorsIfNeeded(computedStyle);
     replaceFontSizeByKeywordIfPossible(computedStyle, computedStyleAtPosition);
   }
 
   m_isMonospaceFont = computedStyleAtPosition->isMonospaceFont();
   extractFontSizeDelta();
 }
 
-void EditingStyle::removeTextFillAndStrokeColorsIfNeeded(
+void EditingStyle::removeInheritedColorsIfNeeded(
     const ComputedStyle* computedStyle) {
   // If a node's text fill color is currentColor, then its children use
   // their font-color as their text fill color (they don't
   // inherit it).  Likewise for stroke color.
+  // Similar thing happens for caret-color if it's auto or currentColor.
   if (computedStyle->textFillColor().isCurrentColor())
     m_mutableStyle->removeProperty(CSSPropertyWebkitTextFillColor);
   if (computedStyle->textStrokeColor().isCurrentColor())
     m_mutableStyle->removeProperty(CSSPropertyWebkitTextStrokeColor);
+  if (computedStyle->caretColor().isAutoColor() ||
+      computedStyle->caretColor().isCurrentColor())
+    m_mutableStyle->removeProperty(CSSPropertyCaretColor);
 }
 
 void EditingStyle::setProperty(CSSPropertyID propertyID,
                                const String& value,
                                bool important) {
   if (!m_mutableStyle)
     m_mutableStyle = MutableStylePropertySet::create(HTMLQuirksMode);
 
   m_mutableStyle->setProperty(propertyID, value, important);
 }
@@ skipping 1519 matching lines @@
   for (Node* ancestor = node; ancestor; ancestor = ancestor->parentNode()) {
     CSSComputedStyleDeclaration* ancestorStyle =
         CSSComputedStyleDeclaration::create(ancestor);
     if (!hasTransparentBackgroundColor(ancestorStyle))
       return ancestorStyle->getPropertyCSSValue(CSSPropertyBackgroundColor);
   }
   return nullptr;
 }
 
 }  // namespace blink