| Index: Source/core/css/resolver/ScopedStyleResolver.h
|
| diff --git a/Source/core/css/resolver/ScopedStyleResolver.h b/Source/core/css/resolver/ScopedStyleResolver.h
|
| index de890521012cfdd86dcf5a8ab45ef31136d5f742..12715e5209c50c8e3421f285f06dadcc3ac526a3 100644
|
| --- a/Source/core/css/resolver/ScopedStyleResolver.h
|
| +++ b/Source/core/css/resolver/ScopedStyleResolver.h
|
| @@ -119,7 +119,7 @@ public:
|
| bool hasOnlyScopeResolverForDocument() const { return m_scopeResolverForDocument && m_authorStyles.size() == 1; }
|
| ScopedStyleResolver* scopedStyleResolverForDocument() { return m_scopeResolverForDocument; }
|
|
|
| - void resolveScopeStyles(const Element*, Vector<std::pair<ScopedStyleResolver*, bool>, 8>& resolvers);
|
| + void resolveScopeStyles(const Element*, Vector<ScopedStyleResolver*, 8>&);
|
| ScopedStyleResolver* scopedResolverFor(const Element*);
|
|
|
| void pushStyleCache(const ContainerNode* scope, const ContainerNode* parent);
|
| @@ -133,7 +133,7 @@ private:
|
|
|
| bool cacheIsValid(const ContainerNode* parent) const { return parent && parent == m_cache.nodeForScopeStyles; }
|
| void resolveStyleCache(const ContainerNode* scope);
|
| - ScopedStyleResolver* enclosingScopedStyleResolverFor(const ContainerNode* scope, int& authorStyleBoundsIndex);
|
| + ScopedStyleResolver* enclosingScopedStyleResolverFor(const ContainerNode* scope);
|
|
|
| private:
|
| HashMap<const ContainerNode*, OwnPtr<ScopedStyleResolver> > m_authorStyles;
|
| @@ -141,16 +141,12 @@ private:
|
|
|
| struct ScopeStyleCache {
|
| ScopedStyleResolver* scopeResolver;
|
| - int scopeResolverBoundsIndex;
|
| const ContainerNode* nodeForScopeStyles;
|
| - int authorStyleBoundsIndex;
|
|
|
| void clear()
|
| {
|
| scopeResolver = 0;
|
| - scopeResolverBoundsIndex = 0;
|
| nodeForScopeStyles = 0;
|
| - authorStyleBoundsIndex = 0;
|
| }
|
| };
|
| ScopeStyleCache m_cache;
|
|
|