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

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

Issue 23890025: WIP (Introduce WTF::NonNullPtr<T>.) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 resolvers.append(resolver); 135 resolvers.append(resolver);
136 } 136 }
137 if (!shadowRoot->containsShadowElements()) 137 if (!shadowRoot->containsShadowElements())
138 break; 138 break;
139 } 139 }
140 } 140 }
141 141
142 void ScopedStyleTree::resolveScopedKeyframesRules(const Element* element, Vector <ScopedStyleResolver*, 8>& resolvers) 142 void ScopedStyleTree::resolveScopedKeyframesRules(const Element* element, Vector <ScopedStyleResolver*, 8>& resolvers)
143 { 143 {
144 Document& document = element->document(); 144 Document& document = element->document();
145 TreeScope& treeScope = element->treeScope(); 145 NonNullPtr<TreeScope> treeScope = element->treeScope();
146 bool applyAuthorStyles = treeScope.applyAuthorStyles(); 146 bool applyAuthorStyles = treeScope->applyAuthorStyles();
147 147
148 for (ScopedStyleResolver* scopedResolver = scopedResolverFor(element); scope dResolver; scopedResolver = scopedResolver->parent()) { 148 for (ScopedStyleResolver* scopedResolver = scopedResolverFor(element); scope dResolver; scopedResolver = scopedResolver->parent()) {
149 if (&scopedResolver->treeScope() == &treeScope || (applyAuthorStyles && &scopedResolver->treeScope() == &document)) 149 if (scopedResolver->treeScope() == treeScope || (applyAuthorStyles && sc opedResolver->treeScope() == &document))
150 resolvers.append(scopedResolver); 150 resolvers.append(scopedResolver);
151 } 151 }
152 } 152 }
153 153
154 inline ScopedStyleResolver* ScopedStyleTree::enclosingScopedStyleResolverFor(con st ContainerNode* scopingNode) 154 inline ScopedStyleResolver* ScopedStyleTree::enclosingScopedStyleResolverFor(con st ContainerNode* scopingNode)
155 { 155 {
156 for (; scopingNode; scopingNode = scopingNode->parentOrShadowHostNode()) { 156 for (; scopingNode; scopingNode = scopingNode->parentOrShadowHostNode()) {
157 if (ScopedStyleResolver* scopedStyleResolver = scopedStyleResolverFor(*s copingNode)) 157 if (ScopedStyleResolver* scopedStyleResolver = scopedStyleResolverFor(*s copingNode))
158 return scopedStyleResolver; 158 return scopedStyleResolver;
159 } 159 }
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 collector.matchPageRules(m_authorStyle.get()); 425 collector.matchPageRules(m_authorStyle.get());
426 } 426 }
427 427
428 void ScopedStyleResolver::collectViewportRulesTo(StyleResolver* resolver) const 428 void ScopedStyleResolver::collectViewportRulesTo(StyleResolver* resolver) const
429 { 429 {
430 if (m_authorStyle) 430 if (m_authorStyle)
431 resolver->collectViewportRules(m_authorStyle.get(), StyleResolver::Autho rOrigin); 431 resolver->collectViewportRules(m_authorStyle.get(), StyleResolver::Autho rOrigin);
432 } 432 }
433 433
434 } // namespace WebCore 434 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/resolver/ScopedStyleResolver.h ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698