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

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

Issue 670373002: Demote 'line-height' to a low priority property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase. Created 6 years, 1 month 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // We need to move this data off of StyleResolverState and closer to the 86 // We need to move this data off of StyleResolverState and closer to the
87 // objects it applies to. Possibly separating (immutable) inputs from (mutab le) outputs. 87 // objects it applies to. Possibly separating (immutable) inputs from (mutab le) outputs.
88 void setApplyPropertyToRegularStyle(bool isApply) { m_applyPropertyToRegular Style = isApply; } 88 void setApplyPropertyToRegularStyle(bool isApply) { m_applyPropertyToRegular Style = isApply; }
89 void setApplyPropertyToVisitedLinkStyle(bool isApply) { m_applyPropertyToVis itedLinkStyle = isApply; } 89 void setApplyPropertyToVisitedLinkStyle(bool isApply) { m_applyPropertyToVis itedLinkStyle = isApply; }
90 bool applyPropertyToRegularStyle() const { return m_applyPropertyToRegularSt yle; } 90 bool applyPropertyToRegularStyle() const { return m_applyPropertyToRegularSt yle; }
91 bool applyPropertyToVisitedLinkStyle() const { return m_applyPropertyToVisit edLinkStyle; } 91 bool applyPropertyToVisitedLinkStyle() const { return m_applyPropertyToVisit edLinkStyle; }
92 92
93 // Holds all attribute names found while applying "content" properties that contain an "attr()" value. 93 // Holds all attribute names found while applying "content" properties that contain an "attr()" value.
94 Vector<AtomicString>& contentAttrValues() { return m_contentAttrValues; } 94 Vector<AtomicString>& contentAttrValues() { return m_contentAttrValues; }
95 95
96 void setLineHeightValue(CSSValue* value) { m_lineHeightValue = value; }
97 CSSValue* lineHeightValue() { return m_lineHeightValue; }
98
99 void cacheUserAgentBorderAndBackground() 96 void cacheUserAgentBorderAndBackground()
100 { 97 {
101 // RenderTheme only needs the cached style if it has an appearance, 98 // RenderTheme only needs the cached style if it has an appearance,
102 // and constructing it is expensive so we avoid it if possible. 99 // and constructing it is expensive so we avoid it if possible.
103 if (!style()->hasAppearance()) 100 if (!style()->hasAppearance())
104 return; 101 return;
105 102
106 m_cachedUAStyle = CachedUAStyle::create(style()); 103 m_cachedUAStyle = CachedUAStyle::create(style());
107 } 104 }
108 105
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 143
147 // m_parentStyle is not always just element->parentNode()->style() 144 // m_parentStyle is not always just element->parentNode()->style()
148 // so we keep it separate from m_elementContext. 145 // so we keep it separate from m_elementContext.
149 RefPtr<RenderStyle> m_parentStyle; 146 RefPtr<RenderStyle> m_parentStyle;
150 147
151 OwnPtrWillBeMember<CSSAnimationUpdate> m_animationUpdate; 148 OwnPtrWillBeMember<CSSAnimationUpdate> m_animationUpdate;
152 149
153 bool m_applyPropertyToRegularStyle; 150 bool m_applyPropertyToRegularStyle;
154 bool m_applyPropertyToVisitedLinkStyle; 151 bool m_applyPropertyToVisitedLinkStyle;
155 152
156 RawPtrWillBeMember<CSSValue> m_lineHeightValue;
157
158 FontBuilder m_fontBuilder; 153 FontBuilder m_fontBuilder;
159 154
160 OwnPtr<CachedUAStyle> m_cachedUAStyle; 155 OwnPtr<CachedUAStyle> m_cachedUAStyle;
161 156
162 ElementStyleResources m_elementStyleResources; 157 ElementStyleResources m_elementStyleResources;
163 // CSSToStyleMap is a pure-logic class and only contains 158 // CSSToStyleMap is a pure-logic class and only contains
164 // a back-pointer to this object. 159 // a back-pointer to this object.
165 CSSToStyleMap m_styleMap; 160 CSSToStyleMap m_styleMap;
166 Vector<AtomicString> m_contentAttrValues; 161 Vector<AtomicString> m_contentAttrValues;
167 }; 162 };
168 163
169 } // namespace blink 164 } // namespace blink
170 165
171 #endif // StyleResolverState_h 166 #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