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

Unified Diff: third_party/WebKit/Source/core/dom/custom/CustomElementUpgradeSorter.cpp

Issue 1995933005: CustomElementUpgradeSorter puts elements in shadow-including tree order. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
Index: third_party/WebKit/Source/core/dom/custom/CustomElementUpgradeSorter.cpp
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementUpgradeSorter.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementUpgradeSorter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..34f9e28e5ea741d3eb6a526ae982debb3d29d0fa
--- /dev/null
+++ b/third_party/WebKit/Source/core/dom/custom/CustomElementUpgradeSorter.cpp
@@ -0,0 +1,90 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "core/dom/custom/CustomElementUpgradeSorter.h"
+
+#include "core/dom/Element.h"
+#include "core/dom/ElementTraversal.h"
+#include "core/dom/Node.h"
+#include "core/dom/shadow/ShadowRoot.h"
+
+namespace blink {
+
+CustomElementUpgradeSorter::CustomElementUpgradeSorter()
+ : m_elements(new HeapHashSet<Member<Element>>())
+ , m_parentChildMap(new ParentChildMap())
+{
+}
+
+void CustomElementUpgradeSorter::add(Element* element)
+{
+ m_elements->add(element);
+
+ for (Node* n = element, *parent = n->parentOrShadowHostNode();
+ parent;
+ n = parent, parent = parent->parentOrShadowHostNode()) {
+
+ ParentChildMap::iterator it = m_parentChildMap->find(parent);
+ if (it == m_parentChildMap->end()) {
+ ParentChildMap::AddResult result =
+ m_parentChildMap->add(parent, HeapHashSet<Member<Node>>());
+ result.storedValue->value.add(n);
+ } else {
+ it->value.add(n);
+ // The entry for the parent exists; so must its parents.
+ break;
+ }
+ }
+}
+
+void CustomElementUpgradeSorter::visit(
+ HeapVector<Member<Element>>* result,
+ ChildSet& children,
+ const ChildSet::iterator& it)
+{
+ if (it == children.end())
+ return;
+ if (it->get()->isElementNode() && m_elements->contains(toElement(*it)))
+ result->append(toElement(*it));
+ sorted(result, *it);
+ children.remove(it);
+}
+
+void CustomElementUpgradeSorter::sorted(
+ HeapVector<Member<Element>>* result,
+ Node* parent)
+{
+ ParentChildMap::iterator childrenIterator = m_parentChildMap->find(parent);
+ if (childrenIterator == m_parentChildMap->end())
+ return;
+
+ ChildSet& children = childrenIterator->value;
+
+ if (children.size() == 1) {
+ visit(result, children, children.begin());
+ return;
+ }
+
+ // TODO(dominicc): When custom elements are used in UA shadow
+ // roots, expand this to include UA shadow roots.
+ ShadowRoot* shadowRoot = parent->isElementNode()
+ ? toElement(parent)->authorShadowRoot()
+ : nullptr;
+ if (shadowRoot)
+ visit(result, children, children.find(shadowRoot));
+
+ for (Element* e = ElementTraversal::firstChild(*parent);
+ e && children.size() > 1;
+ e = ElementTraversal::nextSibling(*e)) {
+
+ visit(result, children, children.find(e));
+ }
+
+ if (children.size() == 1)
+ visit(result, children, children.begin());
+
+ DCHECK(children.isEmpty());
+}
+
+} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698