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

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

Issue 2923333002: Generate StyleRareNonInheritedData in ComputedStyleBase. (Closed)
Patch Set: Rebase Created 3 years, 6 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "core/style/StyleDeprecatedFlexibleBoxData.h" 52 #include "core/style/StyleDeprecatedFlexibleBoxData.h"
53 #include "core/style/StyleDifference.h" 53 #include "core/style/StyleDifference.h"
54 #include "core/style/StyleFilterData.h" 54 #include "core/style/StyleFilterData.h"
55 #include "core/style/StyleFlexibleBoxData.h" 55 #include "core/style/StyleFlexibleBoxData.h"
56 #include "core/style/StyleGridData.h" 56 #include "core/style/StyleGridData.h"
57 #include "core/style/StyleGridItemData.h" 57 #include "core/style/StyleGridItemData.h"
58 #include "core/style/StyleImage.h" 58 #include "core/style/StyleImage.h"
59 #include "core/style/StyleInheritedVariables.h" 59 #include "core/style/StyleInheritedVariables.h"
60 #include "core/style/StyleMultiColData.h" 60 #include "core/style/StyleMultiColData.h"
61 #include "core/style/StyleOffsetRotation.h" 61 #include "core/style/StyleOffsetRotation.h"
62 #include "core/style/StyleRareNonInheritedData.h"
63 #include "core/style/StyleReflection.h" 62 #include "core/style/StyleReflection.h"
64 #include "core/style/StyleSelfAlignmentData.h" 63 #include "core/style/StyleSelfAlignmentData.h"
65 #include "core/style/StyleTransformData.h" 64 #include "core/style/StyleTransformData.h"
66 #include "core/style/StyleWillChangeData.h" 65 #include "core/style/StyleWillChangeData.h"
67 #include "core/style/TextSizeAdjust.h" 66 #include "core/style/TextSizeAdjust.h"
68 #include "core/style/TransformOrigin.h" 67 #include "core/style/TransformOrigin.h"
69 #include "platform/Length.h" 68 #include "platform/Length.h"
70 #include "platform/LengthBox.h" 69 #include "platform/LengthBox.h"
71 #include "platform/LengthPoint.h" 70 #include "platform/LengthPoint.h"
72 #include "platform/LengthSize.h" 71 #include "platform/LengthSize.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 230
232 // FIXME: When we stop resolving currentColor at style time, these can be 231 // FIXME: When we stop resolving currentColor at style time, these can be
233 // removed. 232 // removed.
234 friend class CSSToStyleMap; 233 friend class CSSToStyleMap;
235 friend class FilterOperationResolver; 234 friend class FilterOperationResolver;
236 friend class StyleBuilderConverter; 235 friend class StyleBuilderConverter;
237 friend class StyleResolverState; 236 friend class StyleResolverState;
238 friend class StyleResolver; 237 friend class StyleResolver;
239 238
240 protected: 239 protected:
241 // non-inherited attributes
242 DataRef<StyleRareNonInheritedData> rare_non_inherited_data_;
243
244 // list of associated pseudo styles 240 // list of associated pseudo styles
245 std::unique_ptr<PseudoStyleCache> cached_pseudo_styles_; 241 std::unique_ptr<PseudoStyleCache> cached_pseudo_styles_;
246 242
247 DataRef<SVGComputedStyle> svg_style_; 243 DataRef<SVGComputedStyle> svg_style_;
248 244
249 private: 245 private:
250 // TODO(sashab): Move these private members to the bottom of ComputedStyle. 246 // TODO(sashab): Move these private members to the bottom of ComputedStyle.
251 ALWAYS_INLINE ComputedStyle(); 247 ALWAYS_INLINE ComputedStyle();
252 ALWAYS_INLINE ComputedStyle(const ComputedStyle&); 248 ALWAYS_INLINE ComputedStyle(const ComputedStyle&);
253 249
(...skipping 3324 matching lines...) Expand 10 before | Expand all | Expand 10 after
3578 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); 3574 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
3579 } 3575 }
3580 3576
3581 inline bool ComputedStyle::HasPseudoElementStyle() const { 3577 inline bool ComputedStyle::HasPseudoElementStyle() const {
3582 return PseudoBitsInternal() & kElementPseudoIdMask; 3578 return PseudoBitsInternal() & kElementPseudoIdMask;
3583 } 3579 }
3584 3580
3585 } // namespace blink 3581 } // namespace blink
3586 3582
3587 #endif // ComputedStyle_h 3583 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/BUILD.gn ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698