Oilpan: move custom element objects to the heap.

Source/core/dom/custom/CustomElementRegistrationContext.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 35 matching lines @@
 namespace WebCore {
 
 void CustomElementRegistrationContext::registerElement(Document* document, CustomElementConstructorBuilder* constructorBuilder, const AtomicString& type, CustomElement::NameSet validNames, ExceptionState& exceptionState)
 {
     CustomElementDefinition* definition = m_registry.registerElement(document, constructorBuilder, type, validNames, exceptionState);
 
     if (!definition)
         return;
 
     // Upgrade elements that were waiting for this definition.
-    const CustomElementUpgradeCandidateMap::ElementSet& upgradeCandidates = m_candidates.takeUpgradeCandidatesFor(definition->descriptor());
+    const CustomElementUpgradeCandidateMap::ElementSet& upgradeCandidates = m_candidates->takeUpgradeCandidatesFor(definition->descriptor());
     for (CustomElementUpgradeCandidateMap::ElementSet::const_iterator it = upgradeCandidates.begin(); it != upgradeCandidates.end(); ++it)
         CustomElement::define(*it, definition);
 }
 
 PassRefPtrWillBeRawPtr<Element> CustomElementRegistrationContext::createCustomTagElement(Document& document, const QualifiedName& tagName)
 {
     ASSERT(CustomElement::isValidName(tagName.localName()));
 
     RefPtrWillBeRawPtr<Element> element;
 
@@ skipping 31 matching lines @@
     CustomElementScheduler::resolveOrScheduleResolution(this, element, descriptor);
 }
 
 void CustomElementRegistrationContext::resolve(Element* element, const CustomElementDescriptor& descriptor)
 {
     CustomElementDefinition* definition = m_registry.find(descriptor);
     if (definition) {
         CustomElement::define(element, definition);
     } else {
         ASSERT(element->customElementState() == Element::WaitingForUpgrade);
-        m_candidates.add(descriptor, element);
+        m_candidates->add(descriptor, element);
     }
 }
 
-PassRefPtr<CustomElementRegistrationContext> CustomElementRegistrationContext::create()
+PassRefPtrWillBeRawPtr<CustomElementRegistrationContext> CustomElementRegistrationContext::create()
 {
-    return adoptRef(new CustomElementRegistrationContext());
+    RefPtrWillBeRawPtr<CustomElementRegistrationContext> context = adoptRefWillBeNoop(new CustomElementRegistrationContext());
+    context->m_candidates = CustomElementUpgradeCandidateMap::create();

[haraken, 2014/05/22 08:24:10]

We normally do this kind of initialization in the constructor.

CustomElementRegistrationContext()
    : m_candidates(CustomElementUpgradeCandidateMap::create())
{
}

[sof, 2014/05/25 16:30:01]

Thanks, shifted over.

+    return context.release();
 }
 
 void CustomElementRegistrationContext::setIsAttributeAndTypeExtension(Element* element, const AtomicString& type)
 {
     ASSERT(element);
     ASSERT(!type.isEmpty());
     element->setAttribute(HTMLNames::isAttr, type);
     setTypeExtension(element, type);
 }
 
@@ skipping 18 matching lines @@
     // Custom tags take precedence over type extensions
     ASSERT(!CustomElement::isValidName(element->localName()));
 
     if (!CustomElement::isValidName(type))
         return;
 
     element->setCustomElementState(Element::WaitingForUpgrade);
     context->didGiveTypeExtension(element, type);
 }
 
+void CustomElementRegistrationContext::trace(Visitor* visitor)
+{
+    visitor->trace(m_candidates);
+}
+
 } // namespace WebCore