Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(327)

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.cpp

Issue 2537373005: [css-ui] Make caret-color animatable (Closed)
Patch Set: Patch for landing adding TODO Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/AnimatedStyleBuilder.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 070c725a0c9e87d02d45c3e2a7c9ac80c7f56136..d848a742694be5400eacc12b0b38da0817402edb 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -2090,7 +2090,8 @@ Color ComputedStyle::colorIncludingFallback(int colorProperty,
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.toStyleColor();
+ result = autoColor.isAutoColor() ? StyleColor::currentColor()
+ : autoColor.toStyleColor();
break;
}
case CSSPropertyColor:
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/AnimatedStyleBuilder.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698