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

Side by Side Diff: Source/core/css/resolver/ScopedStyleResolver.cpp

Issue 23819007: Have Node::document() return a reference instead of a pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 3 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
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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 if (ScopedStyleResolver* resolver = scopedStyleResolverFor(shadowRoo t)) 136 if (ScopedStyleResolver* resolver = scopedStyleResolverFor(shadowRoo t))
137 resolvers.append(resolver); 137 resolvers.append(resolver);
138 } 138 }
139 if (!shadowRoot->containsShadowElements()) 139 if (!shadowRoot->containsShadowElements())
140 break; 140 break;
141 } 141 }
142 } 142 }
143 143
144 void ScopedStyleTree::resolveScopedKeyframesRules(const Element* element, Vector <ScopedStyleResolver*, 8>& resolvers) 144 void ScopedStyleTree::resolveScopedKeyframesRules(const Element* element, Vector <ScopedStyleResolver*, 8>& resolvers)
145 { 145 {
146 Document* document = element->document(); 146 Document& document = element->document();
147 TreeScope* treeScope = element->treeScope(); 147 TreeScope* treeScope = element->treeScope();
148 bool applyAuthorStyles = treeScope->applyAuthorStyles(); 148 bool applyAuthorStyles = treeScope->applyAuthorStyles();
149 149
150 for (ScopedStyleResolver* scopedResolver = scopedResolverFor(element); scope dResolver; scopedResolver = scopedResolver->parent()) { 150 for (ScopedStyleResolver* scopedResolver = scopedResolverFor(element); scope dResolver; scopedResolver = scopedResolver->parent()) {
151 if (scopedResolver->treeScope() == treeScope || (applyAuthorStyles && sc opedResolver->treeScope() == document)) 151 if (scopedResolver->treeScope() == treeScope || (applyAuthorStyles && sc opedResolver->treeScope() == &document))
152 resolvers.append(scopedResolver); 152 resolvers.append(scopedResolver);
153 } 153 }
154 } 154 }
155 155
156 inline ScopedStyleResolver* ScopedStyleTree::enclosingScopedStyleResolverFor(con st ContainerNode* scopingNode) 156 inline ScopedStyleResolver* ScopedStyleTree::enclosingScopedStyleResolverFor(con st ContainerNode* scopingNode)
157 { 157 {
158 for (; scopingNode; scopingNode = scopingNode->parentOrShadowHostNode()) { 158 for (; scopingNode; scopingNode = scopingNode->parentOrShadowHostNode()) {
159 if (ScopedStyleResolver* scopedStyleResolver = scopedStyleResolverFor(sc opingNode)) 159 if (ScopedStyleResolver* scopedStyleResolver = scopedStyleResolverFor(sc opingNode))
160 return scopedStyleResolver; 160 return scopedStyleResolver;
161 } 161 }
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 collector.matchPageRules(m_authorStyle.get()); 427 collector.matchPageRules(m_authorStyle.get());
428 } 428 }
429 429
430 void ScopedStyleResolver::collectViewportRulesTo(StyleResolver* resolver) const 430 void ScopedStyleResolver::collectViewportRulesTo(StyleResolver* resolver) const
431 { 431 {
432 if (m_authorStyle) 432 if (m_authorStyle)
433 resolver->collectViewportRules(m_authorStyle.get()); 433 resolver->collectViewportRules(m_authorStyle.get());
434 } 434 }
435 435
436 } // namespace WebCore 436 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/resolver/MatchedPropertiesCache.cpp ('k') | Source/core/css/resolver/SharedStyleFinder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698