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

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

Issue 2882373002: Rename StyleRareInheritedData::indent_ to text_indent_. (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
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleRareInheritedData.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 TextSizeAdjust text_size_adjust; 57 TextSizeAdjust text_size_adjust;
58 }; 58 };
59 59
60 static_assert(sizeof(StyleRareInheritedData) <= 60 static_assert(sizeof(StyleRareInheritedData) <=
61 sizeof(SameSizeAsStyleRareInheritedData), 61 sizeof(SameSizeAsStyleRareInheritedData),
62 "StyleRareInheritedData should stay small"); 62 "StyleRareInheritedData should stay small");
63 63
64 StyleRareInheritedData::StyleRareInheritedData() 64 StyleRareInheritedData::StyleRareInheritedData()
65 : list_style_image_(ComputedStyle::InitialListStyleImage()), 65 : list_style_image_(ComputedStyle::InitialListStyleImage()),
66 text_stroke_width_(ComputedStyle::InitialTextStrokeWidth()), 66 text_stroke_width_(ComputedStyle::InitialTextStrokeWidth()),
67 indent_(ComputedStyle::InitialTextIndent()), 67 text_indent_(ComputedStyle::InitialTextIndent()),
68 effective_zoom_(ComputedStyle::InitialZoom()), 68 effective_zoom_(ComputedStyle::InitialZoom()),
69 widows_(ComputedStyle::InitialWidows()), 69 widows_(ComputedStyle::InitialWidows()),
70 orphans_(ComputedStyle::InitialOrphans()), 70 orphans_(ComputedStyle::InitialOrphans()),
71 text_stroke_color_is_current_color_(true), 71 text_stroke_color_is_current_color_(true),
72 text_fill_color_is_current_color_(true), 72 text_fill_color_is_current_color_(true),
73 text_emphasis_color_is_current_color_(true), 73 text_emphasis_color_is_current_color_(true),
74 caret_color_is_current_color_(false), 74 caret_color_is_current_color_(false),
75 caret_color_is_auto_(true), 75 caret_color_is_auto_(true),
76 visited_link_text_stroke_color_is_current_color_(true), 76 visited_link_text_stroke_color_is_current_color_(true),
77 visited_link_text_fill_color_is_current_color_(true), 77 visited_link_text_fill_color_is_current_color_(true),
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 text_fill_color_(o.text_fill_color_), 120 text_fill_color_(o.text_fill_color_),
121 text_emphasis_color_(o.text_emphasis_color_), 121 text_emphasis_color_(o.text_emphasis_color_),
122 caret_color_(o.caret_color_), 122 caret_color_(o.caret_color_),
123 visited_link_text_stroke_color_(o.visited_link_text_stroke_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_), 124 visited_link_text_fill_color_(o.visited_link_text_fill_color_),
125 visited_link_text_emphasis_color_(o.visited_link_text_emphasis_color_), 125 visited_link_text_emphasis_color_(o.visited_link_text_emphasis_color_),
126 visited_link_caret_color_(o.visited_link_caret_color_), 126 visited_link_caret_color_(o.visited_link_caret_color_),
127 text_shadow_(o.text_shadow_), 127 text_shadow_(o.text_shadow_),
128 highlight_(o.highlight_), 128 highlight_(o.highlight_),
129 cursor_data_(o.cursor_data_), 129 cursor_data_(o.cursor_data_),
130 indent_(o.indent_), 130 text_indent_(o.text_indent_),
131 effective_zoom_(o.effective_zoom_), 131 effective_zoom_(o.effective_zoom_),
132 widows_(o.widows_), 132 widows_(o.widows_),
133 orphans_(o.orphans_), 133 orphans_(o.orphans_),
134 text_stroke_color_is_current_color_( 134 text_stroke_color_is_current_color_(
135 o.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_), 136 text_fill_color_is_current_color_(o.text_fill_color_is_current_color_),
137 text_emphasis_color_is_current_color_( 137 text_emphasis_color_is_current_color_(
138 o.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_), 139 caret_color_is_current_color_(o.caret_color_is_current_color_),
140 caret_color_is_auto_(o.caret_color_is_auto_), 140 caret_color_is_auto_(o.caret_color_is_auto_),
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 text_fill_color_ == o.text_fill_color_ && 193 text_fill_color_ == o.text_fill_color_ &&
194 text_emphasis_color_ == o.text_emphasis_color_ && 194 text_emphasis_color_ == o.text_emphasis_color_ &&
195 caret_color_ == o.caret_color_ && 195 caret_color_ == o.caret_color_ &&
196 visited_link_text_stroke_color_ == o.visited_link_text_stroke_color_ && 196 visited_link_text_stroke_color_ == o.visited_link_text_stroke_color_ &&
197 visited_link_text_fill_color_ == o.visited_link_text_fill_color_ && 197 visited_link_text_fill_color_ == o.visited_link_text_fill_color_ &&
198 visited_link_text_emphasis_color_ == 198 visited_link_text_emphasis_color_ ==
199 o.visited_link_text_emphasis_color_ && 199 o.visited_link_text_emphasis_color_ &&
200 visited_link_caret_color_ == o.visited_link_caret_color_ && 200 visited_link_caret_color_ == o.visited_link_caret_color_ &&
201 tap_highlight_color_ == o.tap_highlight_color_ && 201 tap_highlight_color_ == o.tap_highlight_color_ &&
202 ShadowDataEquivalent(o) && highlight_ == o.highlight_ && 202 ShadowDataEquivalent(o) && highlight_ == o.highlight_ &&
203 DataEquivalent(cursor_data_, o.cursor_data_) && indent_ == o.indent_ && 203 DataEquivalent(cursor_data_, o.cursor_data_) &&
204 text_indent_ == o.text_indent_ &&
204 effective_zoom_ == o.effective_zoom_ && widows_ == o.widows_ && 205 effective_zoom_ == o.effective_zoom_ && widows_ == o.widows_ &&
205 orphans_ == o.orphans_ && 206 orphans_ == o.orphans_ &&
206 text_stroke_color_is_current_color_ == 207 text_stroke_color_is_current_color_ ==
207 o.text_stroke_color_is_current_color_ && 208 o.text_stroke_color_is_current_color_ &&
208 text_fill_color_is_current_color_ == 209 text_fill_color_is_current_color_ ==
209 o.text_fill_color_is_current_color_ && 210 o.text_fill_color_is_current_color_ &&
210 text_emphasis_color_is_current_color_ == 211 text_emphasis_color_is_current_color_ ==
211 o.text_emphasis_color_is_current_color_ && 212 o.text_emphasis_color_is_current_color_ &&
212 caret_color_is_current_color_ == o.caret_color_is_current_color_ && 213 caret_color_is_current_color_ == o.caret_color_is_current_color_ &&
213 caret_color_is_auto_ == o.caret_color_is_auto_ && 214 caret_color_is_auto_ == o.caret_color_is_auto_ &&
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 const StyleRareInheritedData& o) const { 262 const StyleRareInheritedData& o) const {
262 return DataEquivalent(text_shadow_, o.text_shadow_); 263 return DataEquivalent(text_shadow_, o.text_shadow_);
263 } 264 }
264 265
265 bool StyleRareInheritedData::QuotesDataEquivalent( 266 bool StyleRareInheritedData::QuotesDataEquivalent(
266 const StyleRareInheritedData& o) const { 267 const StyleRareInheritedData& o) const {
267 return DataEquivalent(quotes_, o.quotes_); 268 return DataEquivalent(quotes_, o.quotes_);
268 } 269 }
269 270
270 } // namespace blink 271 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleRareInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698