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

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

Issue 1278103002: Oilpan: tidy up some inter-stack object references. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: use STACK_ALLOCATED() more often Created 5 years, 4 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/SharedStyleFinder.cpp ('k') | Source/modules/crypto/CryptoKey.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleResolverParentScope.h
diff --git a/Source/core/css/resolver/StyleResolverParentScope.h b/Source/core/css/resolver/StyleResolverParentScope.h
index 04fb9b203633ede70fa4e3e958aa5b55e56e63ae..eead3296bfabcbbaee6e96ce029e2357b48e9183 100644
--- a/Source/core/css/resolver/StyleResolverParentScope.h
+++ b/Source/core/css/resolver/StyleResolverParentScope.h
@@ -28,7 +28,7 @@ private:
RawPtrWillBeMember<Node> m_parent;
bool m_pushed;
StyleResolverParentScope* m_previous;
- StyleResolver& m_resolver;
+ RawPtrWillBeMember<StyleResolver> m_resolver;
static StyleResolverParentScope* s_currentScope;
};
@@ -37,22 +37,22 @@ inline StyleResolverParentScope::StyleResolverParentScope(Node& parent)
: m_parent(parent)
, m_pushed(false)
, m_previous(s_currentScope)
- , m_resolver(*parent.document().styleResolver())
+ , m_resolver(parent.document().styleResolver())
{
ASSERT(parent.document().inStyleRecalc());
ASSERT(parent.isElementNode() || parent.isShadowRoot());
s_currentScope = this;
- m_resolver.increaseStyleSharingDepth();
+ m_resolver->increaseStyleSharingDepth();
}
inline StyleResolverParentScope::~StyleResolverParentScope()
{
s_currentScope = m_previous;
- m_resolver.decreaseStyleSharingDepth();
+ m_resolver->decreaseStyleSharingDepth();
if (!m_pushed)
return;
if (parent().isElementNode())
- m_resolver.popParentElement(toElement(parent()));
+ m_resolver->popParentElement(toElement(parent()));
}
inline void StyleResolverParentScope::ensureParentStackIsPushed()
@@ -68,7 +68,7 @@ inline void StyleResolverParentScope::pushParentIfNeeded()
if (m_previous)
m_previous->pushParentIfNeeded();
if (parent().isElementNode())
- m_resolver.pushParentElement(toElement(parent()));
+ m_resolver->pushParentElement(toElement(parent()));
m_pushed = true;
}
« no previous file with comments | « Source/core/css/resolver/SharedStyleFinder.cpp ('k') | Source/modules/crypto/CryptoKey.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698