Make custom elements work in HTML imports

third_party/WebKit/Source/core/dom/custom/CustomElementsRegistry.cpp

 // 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/CustomElementsRegistry.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptCustomElementDefinitionBuilder.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 61 matching lines @@
         document ? document->registrationContext() : nullptr)
         registry->entangle(v0);
     return registry;
 }
 
 CustomElementsRegistry::CustomElementsRegistry(const LocalDOMWindow* owner)
     : m_owner(owner)
     , m_v0 (new V0RegistrySet())
     , m_upgradeCandidates(new UpgradeCandidateMap())
 {
+    DCHECK(m_owner->document() == m_owner->document()->contextDocument());

[kochi, 2016/08/22 12:02:00]

Hmm, this is a leftover from Koji's original patch, but as this makes little
sense now (it used to get document as a parameter, but now window).
Removing.

 }
 
 DEFINE_TRACE(CustomElementsRegistry)
 {
     visitor->trace(m_definitions);
     visitor->trace(m_owner);
     visitor->trace(m_v0);
     visitor->trace(m_upgradeCandidates);
     visitor->trace(m_whenDefinedPromiseMap);
 }
@@ skipping 135 matching lines @@
 }
 
 CustomElementDefinition* CustomElementsRegistry::definitionForName(
     const AtomicString& name) const
 {
     return m_definitions.get(name);
 }
 
 void CustomElementsRegistry::addCandidate(Element* candidate)
 {
+    DCHECK(candidate->document().contextDocument() == m_owner->document());

[dominicc (has gone to gerrit), 2016/08/22 08:07:36]

This should actually be harmless, but I guess I don't mind either way. Maybe add
a comment.

[kochi, 2016/08/22 12:02:00]

After https://codereview.chromium.org/2252003002/ (Change custom element state
in documents without browsing context) I think this assertion no longer holds.
Removing.

+
     const AtomicString& name = candidate->localName();
     if (nameIsDefined(name) || v0NameIsDefined(name))
         return;
     UpgradeCandidateMap::iterator it = m_upgradeCandidates->find(name);
     UpgradeCandidateSet* set;
     if (it != m_upgradeCandidates->end()) {
         set = it->value;
     } else {
         set = m_upgradeCandidates->add(name, new UpgradeCandidateSet())
             .storedValue
@@ skipping 22 matching lines @@
     return newResolver->promise();
 }
 
 void CustomElementsRegistry::collectCandidates(
     const CustomElementDescriptor& desc,
     HeapVector<Member<Element>>* elements)
 {
     UpgradeCandidateMap::iterator it = m_upgradeCandidates->find(desc.name());
     if (it == m_upgradeCandidates->end())
         return;
+
     CustomElementUpgradeSorter sorter;
     for (Element* element : *it.get()->value) {
         if (!element || !desc.matches(*element))
             continue;
         sorter.add(element);
     }
 
     m_upgradeCandidates->remove(it);
 
     Document* document = m_owner->document();
     if (!document)
         return;
 
     sorter.sorted(elements, document);
 }
 
 } // namespace blink