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

Unified Diff: Source/core/css/resolver/StyleResolverState.h

Issue 350333003: Cascade declared property values instead of applying values on top of each other (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/core/css/resolver/StyleResolverState.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleResolverState.h
diff --git a/Source/core/css/resolver/StyleResolverState.h b/Source/core/css/resolver/StyleResolverState.h
index 35dd2a24af2323e9408c6b2dc8d90d8a4bd0ffb3..d4b0d4711bcbe3ced0bde53f7871d564a2e32d28 100644
--- a/Source/core/css/resolver/StyleResolverState.h
+++ b/Source/core/css/resolver/StyleResolverState.h
@@ -76,9 +76,6 @@ public:
const RenderStyle* parentStyle() const { return m_parentStyle.get(); }
RenderStyle* parentStyle() { return m_parentStyle.get(); }
- void setCurrentRule(StyleRule* currentRule) { m_currentRule = currentRule; }
- const StyleRule* currentRule() const { return m_currentRule; }
-
// FIXME: These are effectively side-channel "out parameters" for the various
// map functions. When we map from CSS to style objects we use this state object
// to track various meta-data about that mapping (e.g. if it's cache-able).
@@ -92,9 +89,6 @@ public:
// Holds all attribute names found while applying "content" properties that contain an "attr()" value.
Vector<AtomicString>& contentAttrValues() { return m_contentAttrValues; }
- void setLineHeightValue(CSSValue* value) { m_lineHeightValue = value; }
- CSSValue* lineHeightValue() { return m_lineHeightValue; }
-
void cacheUserAgentBorderAndBackground()
{
// RenderTheme only needs the cached style if it has an appearance,
@@ -152,8 +146,6 @@ private:
bool m_applyPropertyToRegularStyle;
bool m_applyPropertyToVisitedLinkStyle;
- RawPtrWillBeMember<CSSValue> m_lineHeightValue;
-
FontBuilder m_fontBuilder;
OwnPtr<CachedUAStyle> m_cachedUAStyle;
@@ -163,8 +155,6 @@ private:
// a back-pointer to this object.
CSSToStyleMap m_styleMap;
Vector<AtomicString> m_contentAttrValues;
-
- RawPtrWillBeMember<StyleRule> m_currentRule;
};
} // namespace blink
« 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