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

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

Issue 2845463003: Rename StyleInheritedData members. (Closed)
Patch Set: Rebase Created 3 years, 8 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 | « no previous file | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | 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) 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, 2009, 2010, 2011 Apple Inc. All 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 184
185 protected: 185 protected:
186 // non-inherited attributes 186 // non-inherited attributes
187 DataRef<StyleBoxData> box_data_; 187 DataRef<StyleBoxData> box_data_;
188 DataRef<StyleVisualData> visual_data_; 188 DataRef<StyleVisualData> visual_data_;
189 DataRef<StyleBackgroundData> background_data_; 189 DataRef<StyleBackgroundData> background_data_;
190 DataRef<StyleRareNonInheritedData> rare_non_inherited_data_; 190 DataRef<StyleRareNonInheritedData> rare_non_inherited_data_;
191 191
192 // inherited attributes 192 // inherited attributes
193 DataRef<StyleRareInheritedData> rare_inherited_data_; 193 DataRef<StyleRareInheritedData> rare_inherited_data_;
194 DataRef<StyleInheritedData> style_inherited_data_; 194 DataRef<StyleInheritedData> inherited_data_;
195 195
196 // list of associated pseudo styles 196 // list of associated pseudo styles
197 std::unique_ptr<PseudoStyleCache> cached_pseudo_styles_; 197 std::unique_ptr<PseudoStyleCache> cached_pseudo_styles_;
198 198
199 DataRef<SVGComputedStyle> svg_style_; 199 DataRef<SVGComputedStyle> svg_style_;
200 200
201 private: 201 private:
202 // TODO(sashab): Move these private members to the bottom of ComputedStyle. 202 // TODO(sashab): Move these private members to the bottom of ComputedStyle.
203 ALWAYS_INLINE ComputedStyle(); 203 ALWAYS_INLINE ComputedStyle();
204 ALWAYS_INLINE ComputedStyle(const ComputedStyle&); 204 ALWAYS_INLINE ComputedStyle(const ComputedStyle&);
(...skipping 2083 matching lines...) Expand 10 before | Expand all | Expand 10 after
2288 // See CSS 2.1, Appendix E (https://www.w3.org/TR/CSS21/zindex.html) for more 2288 // See CSS 2.1, Appendix E (https://www.w3.org/TR/CSS21/zindex.html) for more
2289 // details. 2289 // details.
2290 bool IsStackingContext() const { 2290 bool IsStackingContext() const {
2291 return rare_non_inherited_data_->is_stacking_context_; 2291 return rare_non_inherited_data_->is_stacking_context_;
2292 } 2292 }
2293 void SetIsStackingContext(bool b) { 2293 void SetIsStackingContext(bool b) {
2294 SET_VAR(rare_non_inherited_data_, is_stacking_context_, b); 2294 SET_VAR(rare_non_inherited_data_, is_stacking_context_, b);
2295 } 2295 }
2296 2296
2297 float TextAutosizingMultiplier() const { 2297 float TextAutosizingMultiplier() const {
2298 return style_inherited_data_->text_autosizing_multiplier; 2298 return inherited_data_->text_autosizing_multiplier_;
2299 } 2299 }
2300 void SetTextAutosizingMultiplier(float); 2300 void SetTextAutosizingMultiplier(float);
2301 2301
2302 bool SelfOrAncestorHasDirAutoAttribute() const { 2302 bool SelfOrAncestorHasDirAutoAttribute() const {
2303 return rare_inherited_data_->self_or_ancestor_has_dir_auto_attribute_; 2303 return rare_inherited_data_->self_or_ancestor_has_dir_auto_attribute_;
2304 } 2304 }
2305 void SetSelfOrAncestorHasDirAutoAttribute(bool v) { 2305 void SetSelfOrAncestorHasDirAutoAttribute(bool v) {
2306 SET_VAR(rare_inherited_data_, self_or_ancestor_has_dir_auto_attribute_, v); 2306 SET_VAR(rare_inherited_data_, self_or_ancestor_has_dir_auto_attribute_, v);
2307 } 2307 }
2308 2308
(...skipping 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after
3690 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); 3690 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
3691 } 3691 }
3692 3692
3693 inline bool ComputedStyle::HasPseudoElementStyle() const { 3693 inline bool ComputedStyle::HasPseudoElementStyle() const {
3694 return PseudoBitsInternal() & kElementPseudoIdMask; 3694 return PseudoBitsInternal() & kElementPseudoIdMask;
3695 } 3695 }
3696 3696
3697 } // namespace blink 3697 } // namespace blink
3698 3698
3699 #endif // ComputedStyle_h 3699 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698