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

Unified Diff: Source/core/dom/shadow/ShadowRoot.cpp

Issue 23567016: Have ScopedStyleResolver deal with ContainerNode references, not pointers (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/shadow/ShadowRoot.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/shadow/ShadowRoot.cpp
diff --git a/Source/core/dom/shadow/ShadowRoot.cpp b/Source/core/dom/shadow/ShadowRoot.cpp
index 4554cfa6cd71991c2c2ad1009f702be036fef951..97d892820fbc4a85c296c0b2a5d75f3cd4378b01 100644
--- a/Source/core/dom/shadow/ShadowRoot.cpp
+++ b/Source/core/dom/shadow/ShadowRoot.cpp
@@ -163,7 +163,7 @@ void ShadowRoot::recalcStyle(StyleChange change)
ASSERT(!hasCustomStyleCallbacks());
StyleResolver* styleResolver = document().styleResolver();
- styleResolver->pushParentShadowRoot(this);
+ styleResolver->pushParentShadowRoot(*this);
if (!attached()) {
attach();
@@ -196,7 +196,7 @@ void ShadowRoot::recalcStyle(StyleChange change)
forceReattachOfAnyWhitespaceSibling = didReattach || forceReattachOfAnyWhitespaceSibling;
}
- styleResolver->popParentShadowRoot(this);
+ styleResolver->popParentShadowRoot(*this);
clearNeedsStyleRecalc();
clearChildNeedsStyleRecalc();
}
@@ -253,9 +253,9 @@ void ShadowRoot::setResetStyleInheritance(bool value)
void ShadowRoot::attach(const AttachContext& context)
{
StyleResolver* styleResolver = document().styleResolver();
- styleResolver->pushParentShadowRoot(this);
+ styleResolver->pushParentShadowRoot(*this);
DocumentFragment::attach(context);
- styleResolver->popParentShadowRoot(this);
+ styleResolver->popParentShadowRoot(*this);
}
Node::InsertionNotificationRequest ShadowRoot::insertedInto(ContainerNode* insertionPoint)
« no previous file with comments | « Source/core/dom/shadow/ShadowRoot.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698