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

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

Issue 2874123002: Rename members in StyleRareInheritedData. (Closed)
Patch Set: Created 3 years, 7 months 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 } 67 }
68 ~StyleRareInheritedData(); 68 ~StyleRareInheritedData();
69 69
70 bool operator==(const StyleRareInheritedData&) const; 70 bool operator==(const StyleRareInheritedData&) const;
71 bool operator!=(const StyleRareInheritedData& o) const { 71 bool operator!=(const StyleRareInheritedData& o) const {
72 return !(*this == o); 72 return !(*this == o);
73 } 73 }
74 bool ShadowDataEquivalent(const StyleRareInheritedData&) const; 74 bool ShadowDataEquivalent(const StyleRareInheritedData&) const;
75 bool QuotesDataEquivalent(const StyleRareInheritedData&) const; 75 bool QuotesDataEquivalent(const StyleRareInheritedData&) const;
76 76
77 Persistent<StyleImage> list_style_image; 77 Persistent<StyleImage> list_style_image_;
78 78
79 StyleColor TextStrokeColor() const { 79 StyleColor TextStrokeColor() const {
80 return text_stroke_color_is_current_color_ ? StyleColor::CurrentColor() 80 return text_stroke_color_is_current_color_ ? StyleColor::CurrentColor()
81 : StyleColor(text_stroke_color_); 81 : StyleColor(text_stroke_color_);
82 } 82 }
83 StyleColor TextFillColor() const { 83 StyleColor TextFillColor() const {
84 return text_fill_color_is_current_color_ ? StyleColor::CurrentColor() 84 return text_fill_color_is_current_color_ ? StyleColor::CurrentColor()
85 : StyleColor(text_fill_color_); 85 : StyleColor(text_fill_color_);
86 } 86 }
87 StyleColor TextEmphasisColor() const { 87 StyleColor TextEmphasisColor() const {
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 visited_link_text_emphasis_color_ = color.Resolve(Color()); 148 visited_link_text_emphasis_color_ = color.Resolve(Color());
149 visited_link_text_emphasis_color_is_current_color_ = color.IsCurrentColor(); 149 visited_link_text_emphasis_color_is_current_color_ = color.IsCurrentColor();
150 } 150 }
151 void SetVisitedLinkCaretColor(const StyleAutoColor& color) { 151 void SetVisitedLinkCaretColor(const StyleAutoColor& color) {
152 visited_link_caret_color_ = color.Resolve(Color()); 152 visited_link_caret_color_ = color.Resolve(Color());
153 visited_link_caret_color_is_current_color_ = color.IsCurrentColor(); 153 visited_link_caret_color_is_current_color_ = color.IsCurrentColor();
154 visited_link_caret_color_is_auto_ = color.IsAutoColor(); 154 visited_link_caret_color_is_auto_ = color.IsAutoColor();
155 } 155 }
156 156
157 Color text_stroke_color_; 157 Color text_stroke_color_;
158 float text_stroke_width; 158 float text_stroke_width_;
159 Color text_fill_color_; 159 Color text_fill_color_;
160 Color text_emphasis_color_; 160 Color text_emphasis_color_;
161 Color caret_color_; 161 Color caret_color_;
162 162
163 Color visited_link_text_stroke_color_; 163 Color visited_link_text_stroke_color_;
164 Color visited_link_text_fill_color_; 164 Color visited_link_text_fill_color_;
165 Color visited_link_text_emphasis_color_; 165 Color visited_link_text_emphasis_color_;
166 Color visited_link_caret_color_; 166 Color visited_link_caret_color_;
167 167
168 RefPtr<ShadowList> 168 RefPtr<ShadowList>
169 text_shadow; // Our text shadow information for shadowed text drawing. 169 text_shadow_; // Our text shadow information for shadowed text drawing.
170 AtomicString 170 AtomicString
171 highlight; // Apple-specific extension for custom highlight rendering. 171 highlight_; // Apple-specific extension for custom highlight rendering.
172 172
173 Persistent<CursorList> cursor_data; 173 Persistent<CursorList> cursor_data_;
174 174
175 Length indent; 175 Length indent_;
176 float effective_zoom_; 176 float effective_zoom_;
177 177
178 // Paged media properties. 178 // Paged media properties.
179 short widows; 179 short widows_;
180 short orphans; 180 short orphans_;
181 181
182 unsigned text_stroke_color_is_current_color_ : 1; 182 unsigned text_stroke_color_is_current_color_ : 1;
183 unsigned text_fill_color_is_current_color_ : 1; 183 unsigned text_fill_color_is_current_color_ : 1;
184 unsigned text_emphasis_color_is_current_color_ : 1; 184 unsigned text_emphasis_color_is_current_color_ : 1;
185 unsigned caret_color_is_current_color_ : 1; 185 unsigned caret_color_is_current_color_ : 1;
186 unsigned caret_color_is_auto_ : 1; 186 unsigned caret_color_is_auto_ : 1;
187 unsigned visited_link_text_stroke_color_is_current_color_ : 1; 187 unsigned visited_link_text_stroke_color_is_current_color_ : 1;
188 unsigned visited_link_text_fill_color_is_current_color_ : 1; 188 unsigned visited_link_text_fill_color_is_current_color_ : 1;
189 unsigned visited_link_text_emphasis_color_is_current_color_ : 1; 189 unsigned visited_link_text_emphasis_color_is_current_color_ : 1;
190 unsigned visited_link_caret_color_is_current_color_ : 1; 190 unsigned visited_link_caret_color_is_current_color_ : 1;
191 unsigned visited_link_caret_color_is_auto_ : 1; 191 unsigned visited_link_caret_color_is_auto_ : 1;
192 192
193 unsigned text_security : 2; // ETextSecurity 193 unsigned text_security_ : 2; // ETextSecurity
194 unsigned user_modify : 2; // EUserModify (editing) 194 unsigned user_modify_ : 2; // EUserModify (editing)
195 unsigned word_break : 2; // EWordBreak 195 unsigned word_break_ : 2; // EWordBreak
196 unsigned overflow_wrap : 1; // EOverflowWrap 196 unsigned overflow_wrap_ : 1; // EOverflowWrap
197 unsigned line_break : 3; // LineBreak 197 unsigned line_break_ : 3; // LineBreak
198 unsigned user_select : 2; // EUserSelect 198 unsigned user_select_ : 2; // EUserSelect
199 unsigned speak : 3; // ESpeak 199 unsigned speak_ : 3; // ESpeak
200 unsigned hyphens : 2; // Hyphens 200 unsigned hyphens_ : 2; // Hyphens
201 unsigned text_emphasis_fill : 1; // TextEmphasisFill 201 unsigned text_emphasis_fill_ : 1; // TextEmphasisFill
202 unsigned text_emphasis_mark : 3; // TextEmphasisMark 202 unsigned text_emphasis_mark_ : 3; // TextEmphasisMark
203 unsigned text_emphasis_position : 1; // TextEmphasisPosition 203 unsigned text_emphasis_position_ : 1; // TextEmphasisPosition
204 unsigned text_align_last_ : 3; // TextAlignLast 204 unsigned text_align_last_ : 3; // TextAlignLast
205 unsigned text_justify_ : 2; // TextJustify 205 unsigned text_justify_ : 2; // TextJustify
206 unsigned text_orientation_ : 2; // TextOrientation 206 unsigned text_orientation_ : 2; // TextOrientation
207 unsigned text_combine_ : 1; // CSS3 text-combine-upright properties 207 unsigned text_combine_ : 1; // CSS3 text-combine-upright properties
208 unsigned text_indent_line_ : 1; // TextIndentEachLine 208 unsigned text_indent_line_ : 1; // TextIndentEachLine
209 unsigned text_indent_type_ : 1; // TextIndentHanging 209 unsigned text_indent_type_ : 1; // TextIndentHanging
210 // CSS Image Values Level 3 210 // CSS Image Values Level 3
211 unsigned image_rendering_ : 3; // EImageRendering 211 unsigned image_rendering_ : 3; // EImageRendering
212 unsigned text_underline_position_ : 1; // TextUnderlinePosition 212 unsigned text_underline_position_ : 1; // TextUnderlinePosition
213 unsigned text_decoration_skip_ : 3; // TextDecorationSkip 213 unsigned text_decoration_skip_ : 3; // TextDecorationSkip
214 unsigned ruby_position_ : 1; // RubyPosition 214 unsigned ruby_position_ : 1; // RubyPosition
215 215
216 // Though will-change is not itself an inherited property, the intent 216 // Though will-change is not itself an inherited property, the intent
217 // expressed by 'will-change: contents' includes descendants. 217 // expressed by 'will-change: contents' includes descendants.
218 unsigned subtree_will_change_contents_ : 1; 218 unsigned subtree_will_change_contents_ : 1;
219 219
220 unsigned self_or_ancestor_has_dir_auto_attribute_ : 1; 220 unsigned self_or_ancestor_has_dir_auto_attribute_ : 1;
221 221
222 unsigned respect_image_orientation_ : 1; 222 unsigned respect_image_orientation_ : 1;
223 223
224 AtomicString hyphenation_string; 224 AtomicString hyphenation_string_;
225 short hyphenation_limit_before; 225 short hyphenation_limit_before_;
226 short hyphenation_limit_after; 226 short hyphenation_limit_after_;
227 short hyphenation_limit_lines; 227 short hyphenation_limit_lines_;
228 228
229 uint8_t line_height_step_; 229 uint8_t line_height_step_;
230 230
231 AtomicString text_emphasis_custom_mark; 231 AtomicString text_emphasis_custom_mark_;
232 RefPtr<QuotesData> quotes; 232 RefPtr<QuotesData> quotes_;
233 233
234 Color tap_highlight_color; 234 Color tap_highlight_color_;
235 235
236 RefPtr<AppliedTextDecorationList> applied_text_decorations; 236 RefPtr<AppliedTextDecorationList> applied_text_decorations_;
237 TabSize tab_size_; 237 TabSize tab_size_;
238 238
239 RefPtr<StyleInheritedVariables> variables; 239 RefPtr<StyleInheritedVariables> variables_;
240 TextSizeAdjust text_size_adjust_; 240 TextSizeAdjust text_size_adjust_;
241 241
242 private: 242 private:
243 StyleRareInheritedData(); 243 StyleRareInheritedData();
244 StyleRareInheritedData(const StyleRareInheritedData&); 244 StyleRareInheritedData(const StyleRareInheritedData&);
245 }; 245 };
246 246
247 } // namespace blink 247 } // namespace blink
248 248
249 #endif // StyleRareInheritedData_h 249 #endif // StyleRareInheritedData_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698