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

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

Issue 2520873002: [css-ui] Add support for caret-color property (Closed)
Patch Set: Add test results Created 4 years, 1 month 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
Index: third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
diff --git a/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp b/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
index 0c272d7016e815f950bc14716460eca8196e8540..61b72974ca4dddc3ad01c59086993d1765a26b29 100644
--- a/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
+++ b/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
@@ -39,7 +39,7 @@ struct SameSizeAsStyleRareInheritedData
void* styleImage;
Color firstColor;
float firstFloat;
- Color colors[5];
+ Color colors[7];
void* ownPtrs[1];
AtomicString atomicStrings[3];
void* refPtrs[1];
@@ -71,9 +71,13 @@ StyleRareInheritedData::StyleRareInheritedData()
m_textStrokeColorIsCurrentColor(true),
m_textFillColorIsCurrentColor(true),
m_textEmphasisColorIsCurrentColor(true),
+ m_caretColorIsCurrentColor(false),
+ m_caretColorIsAuto(true),
m_visitedLinkTextStrokeColorIsCurrentColor(true),
m_visitedLinkTextFillColorIsCurrentColor(true),
m_visitedLinkTextEmphasisColorIsCurrentColor(true),
+ m_visitedLinkCaretColorIsCurrentColor(true),
+ m_visitedLinkCaretColorIsAuto(false),
Timothy Loh 2016/11/30 14:51:10 Visited should also default to auto, not currentCo
Manuel Rego 2016/11/30 15:41:53 Yes.
textSecurity(ComputedStyle::initialTextSecurity()),
userModify(READ_ONLY),
wordBreak(ComputedStyle::initialWordBreak()),
@@ -114,9 +118,11 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
textStrokeWidth(o.textStrokeWidth),
m_textFillColor(o.m_textFillColor),
m_textEmphasisColor(o.m_textEmphasisColor),
+ m_caretColor(o.m_caretColor),
m_visitedLinkTextStrokeColor(o.m_visitedLinkTextStrokeColor),
m_visitedLinkTextFillColor(o.m_visitedLinkTextFillColor),
m_visitedLinkTextEmphasisColor(o.m_visitedLinkTextEmphasisColor),
+ m_visitedLinkCaretColor(o.m_visitedLinkCaretColor),
textShadow(o.textShadow),
highlight(o.highlight),
cursorData(o.cursorData),
@@ -127,12 +133,17 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
m_textStrokeColorIsCurrentColor(o.m_textStrokeColorIsCurrentColor),
m_textFillColorIsCurrentColor(o.m_textFillColorIsCurrentColor),
m_textEmphasisColorIsCurrentColor(o.m_textEmphasisColorIsCurrentColor),
+ m_caretColorIsCurrentColor(o.m_caretColorIsCurrentColor),
+ m_caretColorIsAuto(o.m_caretColorIsAuto),
m_visitedLinkTextStrokeColorIsCurrentColor(
o.m_visitedLinkTextStrokeColorIsCurrentColor),
m_visitedLinkTextFillColorIsCurrentColor(
o.m_visitedLinkTextFillColorIsCurrentColor),
m_visitedLinkTextEmphasisColorIsCurrentColor(
o.m_visitedLinkTextEmphasisColorIsCurrentColor),
+ m_visitedLinkCaretColorIsCurrentColor(
+ o.m_visitedLinkCaretColorIsCurrentColor),
+ m_visitedLinkCaretColorIsAuto(o.m_visitedLinkCaretColorIsAuto),
textSecurity(o.textSecurity),
userModify(o.userModify),
wordBreak(o.wordBreak),
@@ -178,6 +189,7 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const {
textStrokeWidth == o.textStrokeWidth &&
m_textFillColor == o.m_textFillColor &&
m_textEmphasisColor == o.m_textEmphasisColor &&
+ m_caretColor == o.m_caretColor &&
Timothy Loh 2016/11/30 14:51:10 Missing a check for m_visitedLinkCaretColor?
Manuel Rego 2016/11/30 15:41:53 Indeed. Nice catch.
m_visitedLinkTextStrokeColor == o.m_visitedLinkTextStrokeColor &&
m_visitedLinkTextFillColor == o.m_visitedLinkTextFillColor &&
m_visitedLinkTextEmphasisColor == o.m_visitedLinkTextEmphasisColor &&
@@ -190,12 +202,17 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const {
m_textFillColorIsCurrentColor == o.m_textFillColorIsCurrentColor &&
m_textEmphasisColorIsCurrentColor ==
o.m_textEmphasisColorIsCurrentColor &&
+ m_caretColorIsCurrentColor == o.m_caretColorIsCurrentColor &&
+ m_caretColorIsAuto == o.m_caretColorIsAuto &&
m_visitedLinkTextStrokeColorIsCurrentColor ==
o.m_visitedLinkTextStrokeColorIsCurrentColor &&
m_visitedLinkTextFillColorIsCurrentColor ==
o.m_visitedLinkTextFillColorIsCurrentColor &&
m_visitedLinkTextEmphasisColorIsCurrentColor ==
o.m_visitedLinkTextEmphasisColorIsCurrentColor &&
+ m_visitedLinkCaretColorIsCurrentColor ==
+ o.m_visitedLinkCaretColorIsCurrentColor &&
+ m_visitedLinkCaretColorIsAuto == o.m_visitedLinkCaretColorIsAuto &&
textSecurity == o.textSecurity && userModify == o.userModify &&
wordBreak == o.wordBreak && overflowWrap == o.overflowWrap &&
lineBreak == o.lineBreak && userSelect == o.userSelect &&

Powered by Google App Engine
This is Rietveld 408576698