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

Side by Side Diff: sky/engine/core/css/resolver/StyleResolver.cpp

Issue 767013004: Remove ScopedStyleResolver::treeScopeFor. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « sky/engine/core/css/resolver/ScopedStyleResolver.cpp ('k') | no next file » | 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, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights 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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 for (unsigned i = 0; i < styleSheets.size(); ++i) 159 for (unsigned i = 0; i < styleSheets.size(); ++i)
160 m_pendingStyleSheets.remove(styleSheets[i].get()); 160 m_pendingStyleSheets.remove(styleSheets[i].get());
161 } 161 }
162 162
163 void StyleResolver::appendCSSStyleSheet(CSSStyleSheet* cssSheet) 163 void StyleResolver::appendCSSStyleSheet(CSSStyleSheet* cssSheet)
164 { 164 {
165 ASSERT(cssSheet); 165 ASSERT(cssSheet);
166 if (cssSheet->mediaQueries() && !m_medium->eval(cssSheet->mediaQueries(), &m _viewportDependentMediaQueryResults)) 166 if (cssSheet->mediaQueries() && !m_medium->eval(cssSheet->mediaQueries(), &m _viewportDependentMediaQueryResults))
167 return; 167 return;
168 168
169 TreeScope* treeScope = ScopedStyleResolver::treeScopeFor(document(), cssShee t); 169 Node* ownerNode = cssSheet->ownerNode();
170 if (!treeScope) 170 if (!ownerNode)
171 return; 171 return;
172 172
173 ScopedStyleResolver& resolver = treeScope->ensureScopedStyleResolver(); 173 TreeScope& treeScope = ownerNode->treeScope();
174 ScopedStyleResolver& resolver = treeScope.ensureScopedStyleResolver();
174 document().styleEngine()->addScopedStyleResolver(&resolver); 175 document().styleEngine()->addScopedStyleResolver(&resolver);
175 resolver.addRulesFromSheet(cssSheet, *m_medium, this); 176 resolver.addRulesFromSheet(cssSheet, *m_medium, this);
176 } 177 }
177 178
178 void StyleResolver::appendPendingAuthorStyleSheets() 179 void StyleResolver::appendPendingAuthorStyleSheets()
179 { 180 {
180 for (ListHashSet<RawPtr<CSSStyleSheet>, 16>::iterator it = m_pendingStyleShe ets.begin(); it != m_pendingStyleSheets.end(); ++it) 181 for (ListHashSet<RawPtr<CSSStyleSheet>, 16>::iterator it = m_pendingStyleShe ets.begin(); it != m_pendingStyleSheets.end(); ++it)
181 appendCSSStyleSheet(*it); 182 appendCSSStyleSheet(*it);
182 183
183 m_pendingStyleSheets.clear(); 184 m_pendingStyleSheets.clear();
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 bool StyleResolver::mediaQueryAffectedByViewportChange() const 976 bool StyleResolver::mediaQueryAffectedByViewportChange() const
976 { 977 {
977 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) { 978 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
978 if (m_medium->eval(m_viewportDependentMediaQueryResults[i]->expression() ) != m_viewportDependentMediaQueryResults[i]->result()) 979 if (m_medium->eval(m_viewportDependentMediaQueryResults[i]->expression() ) != m_viewportDependentMediaQueryResults[i]->result())
979 return true; 980 return true;
980 } 981 }
981 return false; 982 return false;
982 } 983 }
983 984
984 } // namespace blink 985 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/resolver/ScopedStyleResolver.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698