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

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

Issue 2881003002: Cleanup StyleRareInheritedData. (Closed)
Patch Set: Rebase 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) 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 12 matching lines...) Expand all
23 #include "core/style/StyleRareInheritedData.h" 23 #include "core/style/StyleRareInheritedData.h"
24 24
25 #include "core/style/AppliedTextDecoration.h" 25 #include "core/style/AppliedTextDecoration.h"
26 #include "core/style/CursorData.h" 26 #include "core/style/CursorData.h"
27 #include "core/style/DataEquivalency.h" 27 #include "core/style/DataEquivalency.h"
28 #include "core/style/ComputedStyle.h" 28 #include "core/style/ComputedStyle.h"
29 #include "core/style/ComputedStyleConstants.h" 29 #include "core/style/ComputedStyleConstants.h"
30 #include "core/style/QuotesData.h" 30 #include "core/style/QuotesData.h"
31 #include "core/style/ShadowList.h" 31 #include "core/style/ShadowList.h"
32 #include "core/style/StyleImage.h" 32 #include "core/style/StyleImage.h"
33 #include "core/style/StyleInheritedVariables.h" 33 #include "core/style/StyleInheritedVariables.h"
alancutter (OOO until 2018) 2017/05/16 06:23:37 Some of these are now redundant.
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* style_image; 39 void* style_image;
40 Color first_color; 40 Color first_color;
41 float first_float; 41 float first_float;
42 Color colors[7]; 42 Color colors[7];
43 void* own_ptrs[1]; 43 void* own_ptrs[1];
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 respect_image_orientation_(false), 105 respect_image_orientation_(false),
106 subtree_is_sticky_(false), 106 subtree_is_sticky_(false),
107 hyphenation_limit_before_(-1), 107 hyphenation_limit_before_(-1),
108 hyphenation_limit_after_(-1), 108 hyphenation_limit_after_(-1),
109 hyphenation_limit_lines_(-1), 109 hyphenation_limit_lines_(-1),
110 line_height_step_(0), 110 line_height_step_(0),
111 tap_highlight_color_(ComputedStyle::InitialTapHighlightColor()), 111 tap_highlight_color_(ComputedStyle::InitialTapHighlightColor()),
112 tab_size_(ComputedStyle::InitialTabSize()), 112 tab_size_(ComputedStyle::InitialTabSize()),
113 text_size_adjust_(ComputedStyle::InitialTextSizeAdjust()) {} 113 text_size_adjust_(ComputedStyle::InitialTextSizeAdjust()) {}
114 114
115 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
116 : RefCounted<StyleRareInheritedData>(),
117 list_style_image_(o.list_style_image_),
118 text_stroke_color_(o.text_stroke_color_),
119 text_stroke_width_(o.text_stroke_width_),
120 text_fill_color_(o.text_fill_color_),
121 text_emphasis_color_(o.text_emphasis_color_),
122 caret_color_(o.caret_color_),
123 visited_link_text_stroke_color_(o.visited_link_text_stroke_color_),
124 visited_link_text_fill_color_(o.visited_link_text_fill_color_),
125 visited_link_text_emphasis_color_(o.visited_link_text_emphasis_color_),
126 visited_link_caret_color_(o.visited_link_caret_color_),
127 text_shadow_(o.text_shadow_),
128 highlight_(o.highlight_),
129 cursor_data_(o.cursor_data_),
130 indent_(o.indent_),
131 effective_zoom_(o.effective_zoom_),
132 widows_(o.widows_),
133 orphans_(o.orphans_),
134 text_stroke_color_is_current_color_(
135 o.text_stroke_color_is_current_color_),
136 text_fill_color_is_current_color_(o.text_fill_color_is_current_color_),
137 text_emphasis_color_is_current_color_(
138 o.text_emphasis_color_is_current_color_),
139 caret_color_is_current_color_(o.caret_color_is_current_color_),
140 caret_color_is_auto_(o.caret_color_is_auto_),
141 visited_link_text_stroke_color_is_current_color_(
142 o.visited_link_text_stroke_color_is_current_color_),
143 visited_link_text_fill_color_is_current_color_(
144 o.visited_link_text_fill_color_is_current_color_),
145 visited_link_text_emphasis_color_is_current_color_(
146 o.visited_link_text_emphasis_color_is_current_color_),
147 visited_link_caret_color_is_current_color_(
148 o.visited_link_caret_color_is_current_color_),
149 visited_link_caret_color_is_auto_(o.visited_link_caret_color_is_auto_),
150 text_security_(o.text_security_),
151 user_modify_(o.user_modify_),
152 word_break_(o.word_break_),
153 overflow_wrap_(o.overflow_wrap_),
154 line_break_(o.line_break_),
155 user_select_(o.user_select_),
156 speak_(o.speak_),
157 hyphens_(o.hyphens_),
158 text_emphasis_fill_(o.text_emphasis_fill_),
159 text_emphasis_mark_(o.text_emphasis_mark_),
160 text_emphasis_position_(o.text_emphasis_position_),
161 text_align_last_(o.text_align_last_),
162 text_justify_(o.text_justify_),
163 text_orientation_(o.text_orientation_),
164 text_combine_(o.text_combine_),
165 text_indent_line_(o.text_indent_line_),
166 text_indent_type_(o.text_indent_type_),
167 image_rendering_(o.image_rendering_),
168 text_underline_position_(o.text_underline_position_),
169 text_decoration_skip_(o.text_decoration_skip_),
170 ruby_position_(o.ruby_position_),
171 subtree_will_change_contents_(o.subtree_will_change_contents_),
172 self_or_ancestor_has_dir_auto_attribute_(
173 o.self_or_ancestor_has_dir_auto_attribute_),
174 respect_image_orientation_(o.respect_image_orientation_),
175 subtree_is_sticky_(o.subtree_is_sticky_),
176 hyphenation_string_(o.hyphenation_string_),
177 hyphenation_limit_before_(o.hyphenation_limit_before_),
178 hyphenation_limit_after_(o.hyphenation_limit_after_),
179 hyphenation_limit_lines_(o.hyphenation_limit_lines_),
180 line_height_step_(o.line_height_step_),
181 text_emphasis_custom_mark_(o.text_emphasis_custom_mark_),
182 tap_highlight_color_(o.tap_highlight_color_),
183 applied_text_decorations_(o.applied_text_decorations_),
184 tab_size_(o.tab_size_),
185 variables_(o.variables_),
186 text_size_adjust_(o.text_size_adjust_) {}
187
188 StyleRareInheritedData::~StyleRareInheritedData() {}
189
190 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const { 115 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const {
191 return text_stroke_color_ == o.text_stroke_color_ && 116 return text_stroke_color_ == o.text_stroke_color_ &&
192 text_stroke_width_ == o.text_stroke_width_ && 117 text_stroke_width_ == o.text_stroke_width_ &&
193 text_fill_color_ == o.text_fill_color_ && 118 text_fill_color_ == o.text_fill_color_ &&
194 text_emphasis_color_ == o.text_emphasis_color_ && 119 text_emphasis_color_ == o.text_emphasis_color_ &&
195 caret_color_ == o.caret_color_ && 120 caret_color_ == o.caret_color_ &&
196 visited_link_text_stroke_color_ == o.visited_link_text_stroke_color_ && 121 visited_link_text_stroke_color_ == o.visited_link_text_stroke_color_ &&
197 visited_link_text_fill_color_ == o.visited_link_text_fill_color_ && 122 visited_link_text_fill_color_ == o.visited_link_text_fill_color_ &&
198 visited_link_text_emphasis_color_ == 123 visited_link_text_emphasis_color_ ==
199 o.visited_link_text_emphasis_color_ && 124 o.visited_link_text_emphasis_color_ &&
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 const StyleRareInheritedData& o) const { 186 const StyleRareInheritedData& o) const {
262 return DataEquivalent(text_shadow_, o.text_shadow_); 187 return DataEquivalent(text_shadow_, o.text_shadow_);
263 } 188 }
264 189
265 bool StyleRareInheritedData::QuotesDataEquivalent( 190 bool StyleRareInheritedData::QuotesDataEquivalent(
266 const StyleRareInheritedData& o) const { 191 const StyleRareInheritedData& o) const {
267 return DataEquivalent(quotes_, o.quotes_); 192 return DataEquivalent(quotes_, o.quotes_);
268 } 193 }
269 194
270 } // namespace blink 195 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698