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

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

Issue 654693004: Remove meta viewport and @viewport CSS rules. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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 unified diff | Download patch
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 14 matching lines...) Expand all
25 */ 25 */
26 26
27 #include "config.h" 27 #include "config.h"
28 #include "core/css/resolver/ScopedStyleResolver.h" 28 #include "core/css/resolver/ScopedStyleResolver.h"
29 29
30 #include "core/css/CSSStyleSheet.h" 30 #include "core/css/CSSStyleSheet.h"
31 #include "core/css/RuleFeature.h" 31 #include "core/css/RuleFeature.h"
32 #include "core/css/StyleRule.h" 32 #include "core/css/StyleRule.h"
33 #include "core/css/StyleSheetContents.h" 33 #include "core/css/StyleSheetContents.h"
34 #include "core/css/resolver/StyleResolver.h" // For MatchRequest. 34 #include "core/css/resolver/StyleResolver.h" // For MatchRequest.
35 #include "core/css/resolver/ViewportStyleResolver.h"
36 #include "core/dom/Document.h" 35 #include "core/dom/Document.h"
37 #include "core/dom/shadow/ElementShadow.h" 36 #include "core/dom/shadow/ElementShadow.h"
38 #include "core/dom/shadow/ShadowRoot.h" 37 #include "core/dom/shadow/ShadowRoot.h"
39 #include "core/html/HTMLStyleElement.h" 38 #include "core/html/HTMLStyleElement.h"
40 39
41 namespace blink { 40 namespace blink {
42 41
43 TreeScope* ScopedStyleResolver::treeScopeFor(Document& document, const CSSStyleS heet* sheet) 42 TreeScope* ScopedStyleResolver::treeScopeFor(Document& document, const CSSStyleS heet* sheet)
44 { 43 {
45 ASSERT(sheet); 44 ASSERT(sheet);
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 if (!applyAuthorStyles) 125 if (!applyAuthorStyles)
127 contextFlags |= SelectorChecker::ScopeContainsLastMatchedElement; 126 contextFlags |= SelectorChecker::ScopeContainsLastMatchedElement;
128 127
129 RuleRange ruleRange = collector.matchedResult().ranges.authorRuleRange(); 128 RuleRange ruleRange = collector.matchedResult().ranges.authorRuleRange();
130 for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) { 129 for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) {
131 MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet() , includeEmptyRules, &m_scope->rootNode(), m_authorStyleSheets[i], applyAuthorSt yles, i); 130 MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet() , includeEmptyRules, &m_scope->rootNode(), m_authorStyleSheets[i], applyAuthorSt yles, i);
132 collector.collectMatchingRules(matchRequest, ruleRange, static_cast<Sele ctorChecker::ContextFlags>(contextFlags), cascadeScope, cascadeOrder); 131 collector.collectMatchingRules(matchRequest, ruleRange, static_cast<Sele ctorChecker::ContextFlags>(contextFlags), cascadeScope, cascadeOrder);
133 } 132 }
134 } 133 }
135 134
136 void ScopedStyleResolver::collectViewportRulesTo(StyleResolver* resolver) const
137 {
138 if (!m_scope->rootNode().isDocumentNode())
139 return;
140 for (size_t i = 0; i < m_authorStyleSheets.size(); ++i)
141 resolver->viewportStyleResolver()->collectViewportRules(&m_authorStyleSh eets[i]->contents()->ruleSet(), ViewportStyleResolver::AuthorOrigin);
142 }
143
144 void ScopedStyleResolver::trace(Visitor* visitor) 135 void ScopedStyleResolver::trace(Visitor* visitor)
145 { 136 {
146 #if ENABLE(OILPAN) 137 #if ENABLE(OILPAN)
147 visitor->trace(m_scope); 138 visitor->trace(m_scope);
148 visitor->trace(m_authorStyleSheets); 139 visitor->trace(m_authorStyleSheets);
149 visitor->trace(m_keyframesRuleMap); 140 visitor->trace(m_keyframesRuleMap);
150 #endif 141 #endif
151 } 142 }
152 143
153 } // namespace blink 144 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698