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

Unified Diff: Source/core/dom/TreeScope.cpp

Issue 1134173002: Get rid of TreeBoundaryCrossingRules. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Missing important UA rules. Created 5 years, 7 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/TreeScope.h ('k') | Source/core/dom/shadow/ShadowRoot.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/TreeScope.cpp
diff --git a/Source/core/dom/TreeScope.cpp b/Source/core/dom/TreeScope.cpp
index 801eafbc6ec8c056517e19f50aa3d1c0749c8d40..131a6a5cc56329e724f72f838d24e9a3f760b7ac 100644
--- a/Source/core/dom/TreeScope.cpp
+++ b/Source/core/dom/TreeScope.cpp
@@ -60,6 +60,7 @@ TreeScope::TreeScope(ContainerNode& rootNode, Document& document)
: m_rootNode(&rootNode)
, m_document(&document)
, m_parentTreeScope(&document)
+ , m_composedParent(nullptr)
#if !ENABLE(OILPAN)
, m_guardRefCount(0)
#endif
@@ -568,11 +569,35 @@ void TreeScope::setNeedsStyleRecalcForViewportUnits()
}
}
+TreeScope* TreeScope::composedParent()
+{
+ if (rootNode().isDocumentNode())
+ return nullptr;
+ if (!m_composedParent) {
+ ShadowRoot& root = toShadowRoot(rootNode());
+ if (root.olderShadowRoot())
+ m_composedParent = root.olderShadowRoot();
+ else if (ContainerNode* host = rootNode().parentOrShadowHostNode())
+ m_composedParent = treeScopeInComposedTree(*host);
+ }
+ return m_composedParent;
+}
+
+TreeScope* TreeScope::treeScopeInComposedTree(const Node& node)
+{
+ for (Node* composedParent = ComposedTreeTraversal::parent(node); composedParent; composedParent = ComposedTreeTraversal::parent(*composedParent)) {
+ if (composedParent && isShadowHost(composedParent))
+ return toElement(composedParent)->shadow()->youngestShadowRoot();
+ }
+ return &node.document();
+}
+
DEFINE_TRACE(TreeScope)
{
visitor->trace(m_rootNode);
visitor->trace(m_document);
visitor->trace(m_parentTreeScope);
+ visitor->trace(m_composedParent);
visitor->trace(m_idTargetObserverRegistry);
visitor->trace(m_selection);
visitor->trace(m_elementsById);
« no previous file with comments | « Source/core/dom/TreeScope.h ('k') | Source/core/dom/shadow/ShadowRoot.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698