Oilpan: move custom element objects to the heap.

Source/core/dom/custom/CustomElementScheduler.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 29 matching lines @@
 #include "core/dom/custom/CustomElementMicrotaskImportStep.h"
 #include "core/dom/custom/CustomElementMicrotaskQueue.h"
 #include "core/dom/custom/CustomElementMicrotaskResolutionStep.h"
 #include "core/dom/custom/CustomElementRegistrationContext.h"
 #include "core/html/imports/HTMLImportChild.h"
 
 namespace WebCore {
 
 class HTMLImport;
 
-void CustomElementScheduler::scheduleCallback(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtr<Element> element, CustomElementLifecycleCallbacks::CallbackType type)
+void CustomElementScheduler::scheduleCallback(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtrWillBeRawPtr<Element> element, CustomElementLifecycleCallbacks::CallbackType type)
 {
     ASSERT(type != CustomElementLifecycleCallbacks::AttributeChanged);
 
     if (!callbacks->hasCallback(type))
         return;
 
     CustomElementCallbackQueue& queue = instance().schedule(element);
     queue.append(CustomElementCallbackInvocation::createInvocation(callbacks, type));
 }
 
-void CustomElementScheduler::scheduleAttributeChangedCallback(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtr<Element> element, const AtomicString& name, const AtomicString& oldValue, const AtomicString& newValue)
+void CustomElementScheduler::scheduleAttributeChangedCallback(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtrWillBeRawPtr<Element> element, const AtomicString& name, const AtomicString& oldValue, const AtomicString& newValue)
 {
     if (!callbacks->hasCallback(CustomElementLifecycleCallbacks::AttributeChanged))
         return;
 
     CustomElementCallbackQueue& queue = instance().schedule(element);
     queue.append(CustomElementCallbackInvocation::createAttributeChangedInvocation(callbacks, name, oldValue, newValue));
 }
 
-void CustomElementScheduler::resolveOrScheduleResolution(PassRefPtr<CustomElementRegistrationContext> context, PassRefPtr<Element> element, const CustomElementDescriptor& descriptor)
+void CustomElementScheduler::resolveOrScheduleResolution(PassRefPtrWillBeRawPtr<CustomElementRegistrationContext> context, PassRefPtrWillBeRawPtr<Element> element, const CustomElementDescriptor& descriptor)
 {
     if (CustomElementCallbackDispatcher::inCallbackDeliveryScope()) {
         context->resolve(element.get(), descriptor);
         return;
     }
 
     HTMLImportLoader* loader = element->document().importLoader();
-    OwnPtr<CustomElementMicrotaskResolutionStep> step = CustomElementMicrotaskResolutionStep::create(context, element, descriptor);
+    OwnPtrWillBeRawPtr<CustomElementMicrotaskResolutionStep> step = CustomElementMicrotaskResolutionStep::create(context, element, descriptor);
     CustomElementMicrotaskDispatcher::instance().enqueue(loader, step.release());
 }
 
 CustomElementMicrotaskImportStep* CustomElementScheduler::scheduleImport(HTMLImportChild* import)
 {
     ASSERT(!import->isDone());
     ASSERT(import->parent());
 
-    OwnPtr<CustomElementMicrotaskImportStep> step = CustomElementMicrotaskImportStep::create(import);
+    OwnPtrWillBeRawPtr<CustomElementMicrotaskImportStep> step = CustomElementMicrotaskImportStep::create(import);
     CustomElementMicrotaskImportStep* rawStep = step.get();
 
     // Ownership of the new step is transferred to the parent
     // processing step, or the base queue.
     CustomElementMicrotaskDispatcher::instance().enqueue(import->parent()->loader(), step.release());
 
     return rawStep;
 }
 
 CustomElementScheduler& CustomElementScheduler::instance()
 {
+#if ENABLE(OILPAN)
+    DEFINE_STATIC_LOCAL(Persistent<CustomElementScheduler>, instance, (new CustomElementScheduler()));
+    return *instance;
+#else
     DEFINE_STATIC_LOCAL(CustomElementScheduler, instance, ());
     return instance;
+#endif

[haraken, 2014/05/27 01:08:45]

Ditto. I'd prefer DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent...)

 }
 
-CustomElementCallbackQueue& CustomElementScheduler::ensureCallbackQueue(PassRefPtr<Element> element)
+CustomElementCallbackQueue& CustomElementScheduler::ensureCallbackQueue(PassRefPtrWillBeRawPtr<Element> element)
 {
     ElementCallbackQueueMap::ValueType* it = m_elementCallbackQueueMap.add(element.get(), nullptr).storedValue;
     if (!it->value)
         it->value = CustomElementCallbackQueue::create(element);
     return *it->value.get();
 }
 
 void CustomElementScheduler::callbackDispatcherDidFinish()
 {
     if (CustomElementMicrotaskDispatcher::instance().elementQueueIsEmpty())
         instance().clearElementCallbackQueueMap();
 }
 
 void CustomElementScheduler::microtaskDispatcherDidFinish()
 {
     ASSERT(!CustomElementCallbackDispatcher::inCallbackDeliveryScope());
     instance().clearElementCallbackQueueMap();
 }
 
 void CustomElementScheduler::clearElementCallbackQueueMap()
 {
     ElementCallbackQueueMap emptyMap;
     m_elementCallbackQueueMap.swap(emptyMap);
 }
 
 // Finds or creates the callback queue for element.
-CustomElementCallbackQueue& CustomElementScheduler::schedule(PassRefPtr<Element> passElement)
+CustomElementCallbackQueue& CustomElementScheduler::schedule(PassRefPtrWillBeRawPtr<Element> passElement)
 {
-    RefPtr<Element> element(passElement);
+    RefPtrWillBeRawPtr<Element> element(passElement);
 
     CustomElementCallbackQueue& callbackQueue = ensureCallbackQueue(element);
     if (callbackQueue.inCreatedCallback()) {
         // Don't move it. Authors use the createdCallback like a
         // constructor. By not moving it, the createdCallback
         // completes before any other callbacks are entered for this
         // element.
         return callbackQueue;
     }
 
     if (CustomElementCallbackDispatcher::inCallbackDeliveryScope()) {
         // The processing stack is active.
         CustomElementCallbackDispatcher::instance().enqueue(&callbackQueue);
         return callbackQueue;
     }
 
     CustomElementMicrotaskDispatcher::instance().enqueue(&callbackQueue);
     return callbackQueue;
 }
 
+void CustomElementScheduler::trace(Visitor* visitor)
+{
+    visitor->trace(m_elementCallbackQueueMap);
+}
+
 } // namespace WebCore