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

Unified Diff: Source/core/css/DocumentRuleSets.h

Issue 66383005: Remove the concept of user stylesheets. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix WebFrameCSSCallbackTest tests Created 7 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/css/DocumentRuleSets.h
diff --git a/Source/core/css/DocumentRuleSets.h b/Source/core/css/DocumentRuleSets.h
index d3e0b3a2a945d1f04dcc6297a031e0a83ef4fd89..a0bdaa7522e70a1f7f1c61f20cab78f521ca5d3d 100644
--- a/Source/core/css/DocumentRuleSets.h
+++ b/Source/core/css/DocumentRuleSets.h
@@ -37,22 +37,22 @@ class MediaQueryEvaluator;
class RuleFeatureSet;
class StyleEngine;
+// FIXME: This class doesn't really serve a purpose anymore. Merge it into StyleResolver.
class DocumentRuleSets {
public:
DocumentRuleSets();
~DocumentRuleSets();
- RuleSet* userStyle() const { return m_userStyle.get(); }
- void initUserStyle(StyleEngine*, const Vector<RefPtr<StyleRule> >& watchedSelectors, const MediaQueryEvaluator&, StyleResolver&);
+ // FIXME: watched selectors should be implemented using injected author stylesheets: http://crbug.com/316960
+ RuleSet* watchedSelectorRules() const { return m_watchedSelectorsRules.get(); }
+ void initWatchedSelectorRules(const Vector<RefPtr<StyleRule> >& watchedSelectors);
+
void resetAuthorStyle();
void collectFeaturesTo(RuleFeatureSet&, bool isViewSource);
-
TreeBoundaryCrossingRules& treeBoundaryCrossingRules() { return m_treeBoundaryCrossingRules; }
private:
- void collectRulesFromUserStyleSheets(const Vector<RefPtr<CSSStyleSheet> >&, RuleSet& userStyle, const MediaQueryEvaluator&, StyleResolver&);
- void collectRulesFromWatchedSelectors(const Vector<RefPtr<StyleRule> >&, RuleSet& userStyle);
- OwnPtr<RuleSet> m_userStyle;
+ OwnPtr<RuleSet> m_watchedSelectorsRules;
TreeBoundaryCrossingRules m_treeBoundaryCrossingRules;
};
« no previous file with comments | « LayoutTests/userstyles/user-stylesheet-invalidate-expected.txt ('k') | Source/core/css/DocumentRuleSets.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698