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

Unified Diff: Source/core/css/resolver/ScopedStyleTree.h

Issue 102953007: Selectors in styles in shadowRoots should match in all of the host's shadowRoots. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/resolver/ScopedStyleResolver.h ('k') | Source/core/css/resolver/ScopedStyleTree.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/ScopedStyleTree.h
diff --git a/Source/core/css/resolver/ScopedStyleTree.h b/Source/core/css/resolver/ScopedStyleTree.h
index 51f68fe70d7c2abb0165a1315d4d37e004309b20..062c6d7156a439391c9f2af6e80ac4ebf9187ae2 100644
--- a/Source/core/css/resolver/ScopedStyleTree.h
+++ b/Source/core/css/resolver/ScopedStyleTree.h
@@ -55,9 +55,8 @@ public:
ScopedStyleResolver* scopedStyleResolverForDocument() const { return m_scopedResolverForDocument; }
void resolveScopedStyles(const Element*, Vector<ScopedStyleResolver*, 8>&);
- void collectScopedResolversForHostedShadowTrees(const Element*, Vector<ScopedStyleResolver*, 8>&);
void resolveScopedKeyframesRules(const Element*, Vector<ScopedStyleResolver*, 8>&);
- ScopedStyleResolver* scopedResolverFor(const Element*);
+ ScopedStyleResolver* scopedResolverFor(const ContainerNode*);
void remove(const ContainerNode* scopingNode);
@@ -69,6 +68,7 @@ public:
bool buildInDocumentOrder() const { return m_buildInDocumentOrder; }
private:
+ ContainerNode* traverseParent(const ContainerNode*) const;
void setupScopedStylesTree(ScopedStyleResolver* target);
bool cacheIsValid(const ContainerNode* parent) const { return parent && parent == m_cache.nodeForScopedStyles; }
@@ -95,10 +95,10 @@ private:
ScopedStyleCache m_cache;
};
-inline ScopedStyleResolver* ScopedStyleTree::scopedResolverFor(const Element* element)
+inline ScopedStyleResolver* ScopedStyleTree::scopedResolverFor(const ContainerNode* node)
{
- if (!cacheIsValid(element))
- resolveStyleCache(element);
+ if (!cacheIsValid(node))
+ resolveStyleCache(node);
return m_cache.scopedResolver;
}
« no previous file with comments | « Source/core/css/resolver/ScopedStyleResolver.h ('k') | Source/core/css/resolver/ScopedStyleTree.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698