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

Side by Side Diff: Source/core/css/resolver/StyleResolverState.h

Issue 418163003: Simplify watched selector handling and remove remnants of user stylesheets (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cascade
Patch Set: use includeEmptyRules flag on MatchRequest Created 6 years, 4 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 const CSSToLengthConversionData& cssToLengthConversionData() const { return m_cssToLengthConversionData; } 69 const CSSToLengthConversionData& cssToLengthConversionData() const { return m_cssToLengthConversionData; }
70 70
71 void setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate>); 71 void setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate>);
72 const CSSAnimationUpdate* animationUpdate() { return m_animationUpdate.get() ; } 72 const CSSAnimationUpdate* animationUpdate() { return m_animationUpdate.get() ; }
73 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> takeAnimationUpdate(); 73 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> takeAnimationUpdate();
74 74
75 void setParentStyle(PassRefPtr<RenderStyle> parentStyle) { m_parentStyle = p arentStyle; } 75 void setParentStyle(PassRefPtr<RenderStyle> parentStyle) { m_parentStyle = p arentStyle; }
76 const RenderStyle* parentStyle() const { return m_parentStyle.get(); } 76 const RenderStyle* parentStyle() const { return m_parentStyle.get(); }
77 RenderStyle* parentStyle() { return m_parentStyle.get(); } 77 RenderStyle* parentStyle() { return m_parentStyle.get(); }
78 78
79 void setCurrentRule(StyleRule* currentRule) { m_currentRule = currentRule; }
80 const StyleRule* currentRule() const { return m_currentRule; }
81
82 // FIXME: These are effectively side-channel "out parameters" for the variou s 79 // FIXME: These are effectively side-channel "out parameters" for the variou s
83 // map functions. When we map from CSS to style objects we use this state ob ject 80 // map functions. When we map from CSS to style objects we use this state ob ject
84 // to track various meta-data about that mapping (e.g. if it's cache-able). 81 // to track various meta-data about that mapping (e.g. if it's cache-able).
85 // We need to move this data off of StyleResolverState and closer to the 82 // We need to move this data off of StyleResolverState and closer to the
86 // objects it applies to. Possibly separating (immutable) inputs from (mutab le) outputs. 83 // objects it applies to. Possibly separating (immutable) inputs from (mutab le) outputs.
87 void setApplyPropertyToRegularStyle(bool isApply) { m_applyPropertyToRegular Style = isApply; } 84 void setApplyPropertyToRegularStyle(bool isApply) { m_applyPropertyToRegular Style = isApply; }
88 void setApplyPropertyToVisitedLinkStyle(bool isApply) { m_applyPropertyToVis itedLinkStyle = isApply; } 85 void setApplyPropertyToVisitedLinkStyle(bool isApply) { m_applyPropertyToVis itedLinkStyle = isApply; }
89 bool applyPropertyToRegularStyle() const { return m_applyPropertyToRegularSt yle; } 86 bool applyPropertyToRegularStyle() const { return m_applyPropertyToRegularSt yle; }
90 bool applyPropertyToVisitedLinkStyle() const { return m_applyPropertyToVisit edLinkStyle; } 87 bool applyPropertyToVisitedLinkStyle() const { return m_applyPropertyToVisit edLinkStyle; }
91 88
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 153
157 FontBuilder m_fontBuilder; 154 FontBuilder m_fontBuilder;
158 155
159 OwnPtr<CachedUAStyle> m_cachedUAStyle; 156 OwnPtr<CachedUAStyle> m_cachedUAStyle;
160 157
161 ElementStyleResources m_elementStyleResources; 158 ElementStyleResources m_elementStyleResources;
162 // CSSToStyleMap is a pure-logic class and only contains 159 // CSSToStyleMap is a pure-logic class and only contains
163 // a back-pointer to this object. 160 // a back-pointer to this object.
164 CSSToStyleMap m_styleMap; 161 CSSToStyleMap m_styleMap;
165 Vector<AtomicString> m_contentAttrValues; 162 Vector<AtomicString> m_contentAttrValues;
166
167 RawPtrWillBeMember<StyleRule> m_currentRule;
168 }; 163 };
169 164
170 } // namespace blink 165 } // namespace blink
171 166
172 #endif // StyleResolverState_h 167 #endif // StyleResolverState_h
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/core/css/resolver/StyleResolverState.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698