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

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

Issue 2840503002: Generate StyleInheritedData in ComputedStyleBase. (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) 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 class CSSAnimationData; 120 class CSSAnimationData;
121 class CSSTransitionData; 121 class CSSTransitionData;
122 class CSSVariableData; 122 class CSSVariableData;
123 class Font; 123 class Font;
124 class Hyphenation; 124 class Hyphenation;
125 class RotateTransformOperation; 125 class RotateTransformOperation;
126 class ScaleTransformOperation; 126 class ScaleTransformOperation;
127 class ShadowList; 127 class ShadowList;
128 class ShapeValue; 128 class ShapeValue;
129 class StyleImage; 129 class StyleImage;
130 class StyleInheritedData;
131 class StylePath; 130 class StylePath;
132 class StyleResolver; 131 class StyleResolver;
133 class TransformationMatrix; 132 class TransformationMatrix;
134 class TranslateTransformOperation; 133 class TranslateTransformOperation;
135 134
136 class ContentData; 135 class ContentData;
137 136
138 typedef Vector<RefPtr<ComputedStyle>, 4> PseudoStyleCache; 137 typedef Vector<RefPtr<ComputedStyle>, 4> PseudoStyleCache;
139 138
140 // ComputedStyle stores the final style for an element and provides the 139 // ComputedStyle stores the final style for an element and provides the
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 222
224 StyleInheritedData(const StyleInheritedData&) = default; 223 StyleInheritedData(const StyleInheritedData&) = default;
225 }; 224 };
226 225
227 protected: 226 protected:
228 // non-inherited attributes 227 // non-inherited attributes
229 DataRef<StyleRareNonInheritedData> rare_non_inherited_data_; 228 DataRef<StyleRareNonInheritedData> rare_non_inherited_data_;
230 229
231 // inherited attributes 230 // inherited attributes
232 DataRef<StyleRareInheritedData> rare_inherited_data_; 231 DataRef<StyleRareInheritedData> rare_inherited_data_;
233 DataRef<StyleInheritedData> inherited_data_;
234 232
235 // list of associated pseudo styles 233 // list of associated pseudo styles
236 std::unique_ptr<PseudoStyleCache> cached_pseudo_styles_; 234 std::unique_ptr<PseudoStyleCache> cached_pseudo_styles_;
237 235
238 DataRef<SVGComputedStyle> svg_style_; 236 DataRef<SVGComputedStyle> svg_style_;
239 237
240 private: 238 private:
241 // TODO(sashab): Move these private members to the bottom of ComputedStyle. 239 // TODO(sashab): Move these private members to the bottom of ComputedStyle.
242 ALWAYS_INLINE ComputedStyle(); 240 ALWAYS_INLINE ComputedStyle();
243 ALWAYS_INLINE ComputedStyle(const ComputedStyle&); 241 ALWAYS_INLINE ComputedStyle(const ComputedStyle&);
(...skipping 3571 matching lines...) Expand 10 before | Expand all | Expand 10 after
3815 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); 3813 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
3816 } 3814 }
3817 3815
3818 inline bool ComputedStyle::HasPseudoElementStyle() const { 3816 inline bool ComputedStyle::HasPseudoElementStyle() const {
3819 return PseudoBitsInternal() & kElementPseudoIdMask; 3817 return PseudoBitsInternal() & kElementPseudoIdMask;
3820 } 3818 }
3821 3819
3822 } // namespace blink 3820 } // namespace blink
3823 3821
3824 #endif // ComputedStyle_h 3822 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698