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

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

Issue 838003008: Get rid of ensureStyleResolver(). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « sky/engine/core/css/FontFaceSet.cpp ('k') | sky/engine/core/dom/Document.h » ('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 * 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 * Copyright (C) 2012 Google Inc. All rights reserved. 4 * Copyright (C) 2012 Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 29 matching lines...) Expand all
40 namespace blink { 40 namespace blink {
41 41
42 ScopedStyleResolver::ScopedStyleResolver(TreeScope& scope) 42 ScopedStyleResolver::ScopedStyleResolver(TreeScope& scope)
43 : m_scope(scope) 43 : m_scope(scope)
44 { 44 {
45 } 45 }
46 46
47 void ScopedStyleResolver::appendStyleSheet(CSSStyleSheet& sheet) 47 void ScopedStyleResolver::appendStyleSheet(CSSStyleSheet& sheet)
48 { 48 {
49 Document& document = m_scope.document(); 49 Document& document = m_scope.document();
50 StyleResolver& styleResolver = document.ensureStyleResolver(); 50 StyleResolver& styleResolver = document.styleResolver();
51 MediaQueryEvaluator& medium = styleResolver.medium(); 51 MediaQueryEvaluator& medium = styleResolver.medium();
52 52
53 if (sheet.mediaQueries() && !medium.eval(sheet.mediaQueries(), &m_viewportDe pendentMediaQueryResults)) 53 if (sheet.mediaQueries() && !medium.eval(sheet.mediaQueries(), &m_viewportDe pendentMediaQueryResults))
54 return; 54 return;
55 55
56 styleResolver.addMediaQueryAffectedByViewportChange(m_viewportDependentMedia QueryResults); 56 styleResolver.addMediaQueryAffectedByViewportChange(m_viewportDependentMedia QueryResults);
57 57
58 const RuleSet& ruleSet = sheet.contents()->ensureRuleSet(); 58 const RuleSet& ruleSet = sheet.contents()->ensureRuleSet();
59 m_features.add(ruleSet.features()); 59 m_features.add(ruleSet.features());
60 } 60 }
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 void ScopedStyleResolver::collectMatchingHostRules(ElementRuleCollector& collect or, CascadeOrder cascadeOrder) 132 void ScopedStyleResolver::collectMatchingHostRules(ElementRuleCollector& collect or, CascadeOrder cascadeOrder)
133 { 133 {
134 RuleRange ruleRange = collector.matchedResult().ranges.authorRuleRange(); 134 RuleRange ruleRange = collector.matchedResult().ranges.authorRuleRange();
135 for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) { 135 for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) {
136 MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet() , m_authorStyleSheets[i].get(), i); 136 MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet() , m_authorStyleSheets[i].get(), i);
137 collector.collectMatchingHostRules(matchRequest, ruleRange, cascadeOrder ); 137 collector.collectMatchingHostRules(matchRequest, ruleRange, cascadeOrder );
138 } 138 }
139 } 139 }
140 140
141 } // namespace blink 141 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/FontFaceSet.cpp ('k') | sky/engine/core/dom/Document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698