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

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

Issue 2871463002: Move StyleRareInheritedData accessors to be inline in ComputedStyle. (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
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.cpp ('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) 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 {
80 return text_stroke_color_is_current_color_ ? StyleColor::CurrentColor()
81 : StyleColor(text_stroke_color_);
82 }
83 StyleColor TextFillColor() const {
84 return text_fill_color_is_current_color_ ? StyleColor::CurrentColor()
85 : StyleColor(text_fill_color_);
86 }
87 StyleColor TextEmphasisColor() const {
88 return text_emphasis_color_is_current_color_
89 ? StyleColor::CurrentColor()
90 : StyleColor(text_emphasis_color_);
91 }
92 StyleAutoColor CaretColor() const {
93 if (caret_color_is_current_color_)
94 return StyleAutoColor::CurrentColor();
95 if (caret_color_is_auto_)
96 return StyleAutoColor::AutoColor();
97 return StyleAutoColor(caret_color_);
98 }
99 StyleColor VisitedLinkTextStrokeColor() const {
100 return visited_link_text_stroke_color_is_current_color_
101 ? StyleColor::CurrentColor()
102 : StyleColor(visited_link_text_stroke_color_);
103 }
104 StyleColor VisitedLinkTextFillColor() const {
105 return visited_link_text_fill_color_is_current_color_
106 ? StyleColor::CurrentColor()
107 : StyleColor(visited_link_text_fill_color_);
108 }
109 StyleColor VisitedLinkTextEmphasisColor() const {
110 return visited_link_text_emphasis_color_is_current_color_
111 ? StyleColor::CurrentColor()
112 : StyleColor(visited_link_text_emphasis_color_);
113 }
114 StyleAutoColor VisitedLinkCaretColor() const {
115 if (visited_link_caret_color_is_current_color_)
116 return StyleAutoColor::CurrentColor();
117 if (visited_link_caret_color_is_auto_)
118 return StyleAutoColor::AutoColor();
119 return StyleAutoColor(visited_link_caret_color_);
120 }
121
122 void SetTextStrokeColor(const StyleColor& color) {
123 text_stroke_color_ = color.Resolve(Color());
124 text_stroke_color_is_current_color_ = color.IsCurrentColor();
125 }
126 void SetTextFillColor(const StyleColor& color) {
127 text_fill_color_ = color.Resolve(Color());
128 text_fill_color_is_current_color_ = color.IsCurrentColor();
129 }
130 void SetTextEmphasisColor(const StyleColor& color) {
131 text_emphasis_color_ = color.Resolve(Color());
132 text_emphasis_color_is_current_color_ = color.IsCurrentColor();
133 }
134 void SetCaretColor(const StyleAutoColor& color) {
135 caret_color_ = color.Resolve(Color());
136 caret_color_is_current_color_ = color.IsCurrentColor();
137 caret_color_is_auto_ = color.IsAutoColor();
138 }
139 void SetVisitedLinkTextStrokeColor(const StyleColor& color) {
140 visited_link_text_stroke_color_ = color.Resolve(Color());
141 visited_link_text_stroke_color_is_current_color_ = color.IsCurrentColor();
142 }
143 void SetVisitedLinkTextFillColor(const StyleColor& color) {
144 visited_link_text_fill_color_ = color.Resolve(Color());
145 visited_link_text_fill_color_is_current_color_ = color.IsCurrentColor();
146 }
147 void SetVisitedLinkTextEmphasisColor(const StyleColor& color) {
148 visited_link_text_emphasis_color_ = color.Resolve(Color());
149 visited_link_text_emphasis_color_is_current_color_ = color.IsCurrentColor();
150 }
151 void SetVisitedLinkCaretColor(const StyleAutoColor& color) {
152 visited_link_caret_color_ = color.Resolve(Color());
153 visited_link_caret_color_is_current_color_ = color.IsCurrentColor();
154 visited_link_caret_color_is_auto_ = color.IsAutoColor();
155 }
156
157 Color text_stroke_color_; 79 Color text_stroke_color_;
158 float text_stroke_width_; 80 float text_stroke_width_;
159 Color text_fill_color_; 81 Color text_fill_color_;
160 Color text_emphasis_color_; 82 Color text_emphasis_color_;
161 Color caret_color_; 83 Color caret_color_;
162 84
163 Color visited_link_text_stroke_color_; 85 Color visited_link_text_stroke_color_;
164 Color visited_link_text_fill_color_; 86 Color visited_link_text_fill_color_;
165 Color visited_link_text_emphasis_color_; 87 Color visited_link_text_emphasis_color_;
166 Color visited_link_caret_color_; 88 Color visited_link_caret_color_;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 TextSizeAdjust text_size_adjust_; 162 TextSizeAdjust text_size_adjust_;
241 163
242 private: 164 private:
243 StyleRareInheritedData(); 165 StyleRareInheritedData();
244 StyleRareInheritedData(const StyleRareInheritedData&); 166 StyleRareInheritedData(const StyleRareInheritedData&);
245 }; 167 };
246 168
247 } // namespace blink 169 } // namespace blink
248 170
249 #endif // StyleRareInheritedData_h 171 #endif // StyleRareInheritedData_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698