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

Side by Side Diff: third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp

Issue 2520873002: [css-ui] Add support for caret-color property (Closed)
Patch Set: Patch for landing applying suggested changes 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
4 * reserved. 4 * reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 21 matching lines...) Expand all
32 #include "core/style/StyleImage.h" 32 #include "core/style/StyleImage.h"
33 #include "core/style/StyleInheritedVariables.h" 33 #include "core/style/StyleInheritedVariables.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 struct SameSizeAsStyleRareInheritedData 37 struct SameSizeAsStyleRareInheritedData
38 : public RefCounted<SameSizeAsStyleRareInheritedData> { 38 : public RefCounted<SameSizeAsStyleRareInheritedData> {
39 void* styleImage; 39 void* styleImage;
40 Color firstColor; 40 Color firstColor;
41 float firstFloat; 41 float firstFloat;
42 Color colors[5]; 42 Color colors[7];
43 void* ownPtrs[1]; 43 void* ownPtrs[1];
44 AtomicString atomicStrings[3]; 44 AtomicString atomicStrings[3];
45 void* refPtrs[1]; 45 void* refPtrs[1];
46 Persistent<void*> persistentHandles[2]; 46 Persistent<void*> persistentHandles[2];
47 Length lengths[1]; 47 Length lengths[1];
48 float secondFloat; 48 float secondFloat;
49 unsigned m_bitfields[2]; 49 unsigned m_bitfields[2];
50 short pagedMediaShorts[2]; 50 short pagedMediaShorts[2];
51 short hyphenationShorts[3]; 51 short hyphenationShorts[3];
52 uint8_t snapHeight; 52 uint8_t snapHeight;
(...skipping 11 matching lines...) Expand all
64 StyleRareInheritedData::StyleRareInheritedData() 64 StyleRareInheritedData::StyleRareInheritedData()
65 : listStyleImage(ComputedStyle::initialListStyleImage()), 65 : listStyleImage(ComputedStyle::initialListStyleImage()),
66 textStrokeWidth(ComputedStyle::initialTextStrokeWidth()), 66 textStrokeWidth(ComputedStyle::initialTextStrokeWidth()),
67 indent(ComputedStyle::initialTextIndent()), 67 indent(ComputedStyle::initialTextIndent()),
68 m_effectiveZoom(ComputedStyle::initialZoom()), 68 m_effectiveZoom(ComputedStyle::initialZoom()),
69 widows(ComputedStyle::initialWidows()), 69 widows(ComputedStyle::initialWidows()),
70 orphans(ComputedStyle::initialOrphans()), 70 orphans(ComputedStyle::initialOrphans()),
71 m_textStrokeColorIsCurrentColor(true), 71 m_textStrokeColorIsCurrentColor(true),
72 m_textFillColorIsCurrentColor(true), 72 m_textFillColorIsCurrentColor(true),
73 m_textEmphasisColorIsCurrentColor(true), 73 m_textEmphasisColorIsCurrentColor(true),
74 m_caretColorIsCurrentColor(false),
75 m_caretColorIsAuto(true),
74 m_visitedLinkTextStrokeColorIsCurrentColor(true), 76 m_visitedLinkTextStrokeColorIsCurrentColor(true),
75 m_visitedLinkTextFillColorIsCurrentColor(true), 77 m_visitedLinkTextFillColorIsCurrentColor(true),
76 m_visitedLinkTextEmphasisColorIsCurrentColor(true), 78 m_visitedLinkTextEmphasisColorIsCurrentColor(true),
79 m_visitedLinkCaretColorIsCurrentColor(false),
80 m_visitedLinkCaretColorIsAuto(true),
77 textSecurity(ComputedStyle::initialTextSecurity()), 81 textSecurity(ComputedStyle::initialTextSecurity()),
78 userModify(READ_ONLY), 82 userModify(READ_ONLY),
79 wordBreak(ComputedStyle::initialWordBreak()), 83 wordBreak(ComputedStyle::initialWordBreak()),
80 overflowWrap(ComputedStyle::initialOverflowWrap()), 84 overflowWrap(ComputedStyle::initialOverflowWrap()),
81 lineBreak(LineBreakAuto), 85 lineBreak(LineBreakAuto),
82 userSelect(ComputedStyle::initialUserSelect()), 86 userSelect(ComputedStyle::initialUserSelect()),
83 speak(SpeakNormal), 87 speak(SpeakNormal),
84 hyphens(HyphensManual), 88 hyphens(HyphensManual),
85 textEmphasisFill(TextEmphasisFillFilled), 89 textEmphasisFill(TextEmphasisFillFilled),
86 textEmphasisMark(TextEmphasisMarkNone), 90 textEmphasisMark(TextEmphasisMarkNone),
(...skipping 20 matching lines...) Expand all
107 m_tabSize(ComputedStyle::initialTabSize()), 111 m_tabSize(ComputedStyle::initialTabSize()),
108 m_textSizeAdjust(ComputedStyle::initialTextSizeAdjust()) {} 112 m_textSizeAdjust(ComputedStyle::initialTextSizeAdjust()) {}
109 113
110 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) 114 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
111 : RefCounted<StyleRareInheritedData>(), 115 : RefCounted<StyleRareInheritedData>(),
112 listStyleImage(o.listStyleImage), 116 listStyleImage(o.listStyleImage),
113 m_textStrokeColor(o.m_textStrokeColor), 117 m_textStrokeColor(o.m_textStrokeColor),
114 textStrokeWidth(o.textStrokeWidth), 118 textStrokeWidth(o.textStrokeWidth),
115 m_textFillColor(o.m_textFillColor), 119 m_textFillColor(o.m_textFillColor),
116 m_textEmphasisColor(o.m_textEmphasisColor), 120 m_textEmphasisColor(o.m_textEmphasisColor),
121 m_caretColor(o.m_caretColor),
117 m_visitedLinkTextStrokeColor(o.m_visitedLinkTextStrokeColor), 122 m_visitedLinkTextStrokeColor(o.m_visitedLinkTextStrokeColor),
118 m_visitedLinkTextFillColor(o.m_visitedLinkTextFillColor), 123 m_visitedLinkTextFillColor(o.m_visitedLinkTextFillColor),
119 m_visitedLinkTextEmphasisColor(o.m_visitedLinkTextEmphasisColor), 124 m_visitedLinkTextEmphasisColor(o.m_visitedLinkTextEmphasisColor),
125 m_visitedLinkCaretColor(o.m_visitedLinkCaretColor),
120 textShadow(o.textShadow), 126 textShadow(o.textShadow),
121 highlight(o.highlight), 127 highlight(o.highlight),
122 cursorData(o.cursorData), 128 cursorData(o.cursorData),
123 indent(o.indent), 129 indent(o.indent),
124 m_effectiveZoom(o.m_effectiveZoom), 130 m_effectiveZoom(o.m_effectiveZoom),
125 widows(o.widows), 131 widows(o.widows),
126 orphans(o.orphans), 132 orphans(o.orphans),
127 m_textStrokeColorIsCurrentColor(o.m_textStrokeColorIsCurrentColor), 133 m_textStrokeColorIsCurrentColor(o.m_textStrokeColorIsCurrentColor),
128 m_textFillColorIsCurrentColor(o.m_textFillColorIsCurrentColor), 134 m_textFillColorIsCurrentColor(o.m_textFillColorIsCurrentColor),
129 m_textEmphasisColorIsCurrentColor(o.m_textEmphasisColorIsCurrentColor), 135 m_textEmphasisColorIsCurrentColor(o.m_textEmphasisColorIsCurrentColor),
136 m_caretColorIsCurrentColor(o.m_caretColorIsCurrentColor),
137 m_caretColorIsAuto(o.m_caretColorIsAuto),
130 m_visitedLinkTextStrokeColorIsCurrentColor( 138 m_visitedLinkTextStrokeColorIsCurrentColor(
131 o.m_visitedLinkTextStrokeColorIsCurrentColor), 139 o.m_visitedLinkTextStrokeColorIsCurrentColor),
132 m_visitedLinkTextFillColorIsCurrentColor( 140 m_visitedLinkTextFillColorIsCurrentColor(
133 o.m_visitedLinkTextFillColorIsCurrentColor), 141 o.m_visitedLinkTextFillColorIsCurrentColor),
134 m_visitedLinkTextEmphasisColorIsCurrentColor( 142 m_visitedLinkTextEmphasisColorIsCurrentColor(
135 o.m_visitedLinkTextEmphasisColorIsCurrentColor), 143 o.m_visitedLinkTextEmphasisColorIsCurrentColor),
144 m_visitedLinkCaretColorIsCurrentColor(
145 o.m_visitedLinkCaretColorIsCurrentColor),
146 m_visitedLinkCaretColorIsAuto(o.m_visitedLinkCaretColorIsAuto),
136 textSecurity(o.textSecurity), 147 textSecurity(o.textSecurity),
137 userModify(o.userModify), 148 userModify(o.userModify),
138 wordBreak(o.wordBreak), 149 wordBreak(o.wordBreak),
139 overflowWrap(o.overflowWrap), 150 overflowWrap(o.overflowWrap),
140 lineBreak(o.lineBreak), 151 lineBreak(o.lineBreak),
141 userSelect(o.userSelect), 152 userSelect(o.userSelect),
142 speak(o.speak), 153 speak(o.speak),
143 hyphens(o.hyphens), 154 hyphens(o.hyphens),
144 textEmphasisFill(o.textEmphasisFill), 155 textEmphasisFill(o.textEmphasisFill),
145 textEmphasisMark(o.textEmphasisMark), 156 textEmphasisMark(o.textEmphasisMark),
(...skipping 25 matching lines...) Expand all
171 variables(o.variables), 182 variables(o.variables),
172 m_textSizeAdjust(o.m_textSizeAdjust) {} 183 m_textSizeAdjust(o.m_textSizeAdjust) {}
173 184
174 StyleRareInheritedData::~StyleRareInheritedData() {} 185 StyleRareInheritedData::~StyleRareInheritedData() {}
175 186
176 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const { 187 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const {
177 return m_textStrokeColor == o.m_textStrokeColor && 188 return m_textStrokeColor == o.m_textStrokeColor &&
178 textStrokeWidth == o.textStrokeWidth && 189 textStrokeWidth == o.textStrokeWidth &&
179 m_textFillColor == o.m_textFillColor && 190 m_textFillColor == o.m_textFillColor &&
180 m_textEmphasisColor == o.m_textEmphasisColor && 191 m_textEmphasisColor == o.m_textEmphasisColor &&
192 m_caretColor == o.m_caretColor &&
181 m_visitedLinkTextStrokeColor == o.m_visitedLinkTextStrokeColor && 193 m_visitedLinkTextStrokeColor == o.m_visitedLinkTextStrokeColor &&
182 m_visitedLinkTextFillColor == o.m_visitedLinkTextFillColor && 194 m_visitedLinkTextFillColor == o.m_visitedLinkTextFillColor &&
183 m_visitedLinkTextEmphasisColor == o.m_visitedLinkTextEmphasisColor && 195 m_visitedLinkTextEmphasisColor == o.m_visitedLinkTextEmphasisColor &&
196 m_visitedLinkCaretColor == o.m_visitedLinkCaretColor &&
184 tapHighlightColor == o.tapHighlightColor && shadowDataEquivalent(o) && 197 tapHighlightColor == o.tapHighlightColor && shadowDataEquivalent(o) &&
185 highlight == o.highlight && 198 highlight == o.highlight &&
186 dataEquivalent(cursorData.get(), o.cursorData.get()) && 199 dataEquivalent(cursorData.get(), o.cursorData.get()) &&
187 indent == o.indent && m_effectiveZoom == o.m_effectiveZoom && 200 indent == o.indent && m_effectiveZoom == o.m_effectiveZoom &&
188 widows == o.widows && orphans == o.orphans && 201 widows == o.widows && orphans == o.orphans &&
189 m_textStrokeColorIsCurrentColor == o.m_textStrokeColorIsCurrentColor && 202 m_textStrokeColorIsCurrentColor == o.m_textStrokeColorIsCurrentColor &&
190 m_textFillColorIsCurrentColor == o.m_textFillColorIsCurrentColor && 203 m_textFillColorIsCurrentColor == o.m_textFillColorIsCurrentColor &&
191 m_textEmphasisColorIsCurrentColor == 204 m_textEmphasisColorIsCurrentColor ==
192 o.m_textEmphasisColorIsCurrentColor && 205 o.m_textEmphasisColorIsCurrentColor &&
206 m_caretColorIsCurrentColor == o.m_caretColorIsCurrentColor &&
207 m_caretColorIsAuto == o.m_caretColorIsAuto &&
193 m_visitedLinkTextStrokeColorIsCurrentColor == 208 m_visitedLinkTextStrokeColorIsCurrentColor ==
194 o.m_visitedLinkTextStrokeColorIsCurrentColor && 209 o.m_visitedLinkTextStrokeColorIsCurrentColor &&
195 m_visitedLinkTextFillColorIsCurrentColor == 210 m_visitedLinkTextFillColorIsCurrentColor ==
196 o.m_visitedLinkTextFillColorIsCurrentColor && 211 o.m_visitedLinkTextFillColorIsCurrentColor &&
197 m_visitedLinkTextEmphasisColorIsCurrentColor == 212 m_visitedLinkTextEmphasisColorIsCurrentColor ==
198 o.m_visitedLinkTextEmphasisColorIsCurrentColor && 213 o.m_visitedLinkTextEmphasisColorIsCurrentColor &&
214 m_visitedLinkCaretColorIsCurrentColor ==
215 o.m_visitedLinkCaretColorIsCurrentColor &&
216 m_visitedLinkCaretColorIsAuto == o.m_visitedLinkCaretColorIsAuto &&
199 textSecurity == o.textSecurity && userModify == o.userModify && 217 textSecurity == o.textSecurity && userModify == o.userModify &&
200 wordBreak == o.wordBreak && overflowWrap == o.overflowWrap && 218 wordBreak == o.wordBreak && overflowWrap == o.overflowWrap &&
201 lineBreak == o.lineBreak && userSelect == o.userSelect && 219 lineBreak == o.lineBreak && userSelect == o.userSelect &&
202 speak == o.speak && hyphens == o.hyphens && 220 speak == o.speak && hyphens == o.hyphens &&
203 hyphenationLimitBefore == o.hyphenationLimitBefore && 221 hyphenationLimitBefore == o.hyphenationLimitBefore &&
204 hyphenationLimitAfter == o.hyphenationLimitAfter && 222 hyphenationLimitAfter == o.hyphenationLimitAfter &&
205 hyphenationLimitLines == o.hyphenationLimitLines && 223 hyphenationLimitLines == o.hyphenationLimitLines &&
206 textEmphasisFill == o.textEmphasisFill && 224 textEmphasisFill == o.textEmphasisFill &&
207 textEmphasisMark == o.textEmphasisMark && 225 textEmphasisMark == o.textEmphasisMark &&
208 textEmphasisPosition == o.textEmphasisPosition && 226 textEmphasisPosition == o.textEmphasisPosition &&
(...skipping 26 matching lines...) Expand all
235 const StyleRareInheritedData& o) const { 253 const StyleRareInheritedData& o) const {
236 return dataEquivalent(textShadow.get(), o.textShadow.get()); 254 return dataEquivalent(textShadow.get(), o.textShadow.get());
237 } 255 }
238 256
239 bool StyleRareInheritedData::quotesDataEquivalent( 257 bool StyleRareInheritedData::quotesDataEquivalent(
240 const StyleRareInheritedData& o) const { 258 const StyleRareInheritedData& o) const {
241 return dataEquivalent(quotes, o.quotes); 259 return dataEquivalent(quotes, o.quotes);
242 } 260 }
243 261
244 } // namespace blink 262 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleRareInheritedData.h ('k') | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698