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

Side by Side Diff: Source/core/css/DocumentRuleSets.cpp

Issue 25505007: Remove bogus use of the term "user style" in Blink and Blink API (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Patch for landing Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/css/InspectorCSSOMWrappers.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 DocumentRuleSets::~DocumentRuleSets() 73 DocumentRuleSets::~DocumentRuleSets()
74 { 74 {
75 } 75 }
76 76
77 void DocumentRuleSets::initUserStyle(StyleEngine* styleSheetCollection, const Ve ctor<RefPtr<StyleRule> >& watchedSelectors, const MediaQueryEvaluator& medium, S tyleResolver& resolver) 77 void DocumentRuleSets::initUserStyle(StyleEngine* styleSheetCollection, const Ve ctor<RefPtr<StyleRule> >& watchedSelectors, const MediaQueryEvaluator& medium, S tyleResolver& resolver)
78 { 78 {
79 OwnPtr<RuleSet> tempUserStyle = RuleSet::create(); 79 OwnPtr<RuleSet> tempUserStyle = RuleSet::create();
80 if (CSSStyleSheet* pageUserSheet = styleSheetCollection->pageUserSheet()) 80 if (CSSStyleSheet* pageUserSheet = styleSheetCollection->pageUserSheet())
81 tempUserStyle->addRulesFromSheet(pageUserSheet->contents(), medium, &res olver); 81 tempUserStyle->addRulesFromSheet(pageUserSheet->contents(), medium, &res olver);
82 collectRulesFromUserStyleSheets(styleSheetCollection->injectedUserStyleSheet s(), *tempUserStyle, medium, resolver);
83 collectRulesFromUserStyleSheets(styleSheetCollection->documentUserStyleSheet s(), *tempUserStyle, medium, resolver); 82 collectRulesFromUserStyleSheets(styleSheetCollection->documentUserStyleSheet s(), *tempUserStyle, medium, resolver);
84 collectRulesFromWatchedSelectors(watchedSelectors, *tempUserStyle); 83 collectRulesFromWatchedSelectors(watchedSelectors, *tempUserStyle);
85 if (tempUserStyle->ruleCount() > 0 || tempUserStyle->pageRules().size() > 0) 84 if (tempUserStyle->ruleCount() > 0 || tempUserStyle->pageRules().size() > 0)
86 m_userStyle = tempUserStyle.release(); 85 m_userStyle = tempUserStyle.release();
87 } 86 }
88 87
89 void DocumentRuleSets::collectRulesFromUserStyleSheets(const Vector<RefPtr<CSSSt yleSheet> >& userSheets, RuleSet& userStyle, const MediaQueryEvaluator& medium, StyleResolver& resolver) 88 void DocumentRuleSets::collectRulesFromUserStyleSheets(const Vector<RefPtr<CSSSt yleSheet> >& userSheets, RuleSet& userStyle, const MediaQueryEvaluator& medium, StyleResolver& resolver)
90 { 89 {
91 for (unsigned i = 0; i < userSheets.size(); ++i) { 90 for (unsigned i = 0; i < userSheets.size(); ++i) {
92 ASSERT(userSheets[i]->contents()->isUserStyleSheet()); 91 ASSERT(userSheets[i]->contents()->isUserStyleSheet());
(...skipping 23 matching lines...) Expand all
116 if (isViewSource) 115 if (isViewSource)
117 features.add(CSSDefaultStyleSheets::viewSourceStyle()->features()); 116 features.add(CSSDefaultStyleSheets::viewSourceStyle()->features());
118 117
119 if (m_userStyle) 118 if (m_userStyle)
120 features.add(m_userStyle->features()); 119 features.add(m_userStyle->features());
121 120
122 m_shadowDistributedRules.collectFeaturesTo(features); 121 m_shadowDistributedRules.collectFeaturesTo(features);
123 } 122 }
124 123
125 } // namespace WebCore 124 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/css/InspectorCSSOMWrappers.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698