Oilpan: move custom element objects to the heap.

Source/core/dom/custom/CustomElementMicrotaskDispatcher.cpp

 // Copyright 2014 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 "config.h"
 #include "core/dom/custom/CustomElementMicrotaskDispatcher.h"
 
 #include "core/dom/Microtask.h"
 #include "core/dom/custom/CustomElementCallbackDispatcher.h"
 #include "core/dom/custom/CustomElementCallbackQueue.h"
 #include "core/dom/custom/CustomElementMicrotaskImportStep.h"
 #include "core/dom/custom/CustomElementMicrotaskQueue.h"
 #include "core/dom/custom/CustomElementScheduler.h"
 #include "core/html/imports/HTMLImportLoader.h"
 #include "wtf/MainThread.h"
 
 namespace WebCore {
 
 static const CustomElementCallbackQueue::ElementQueueId kMicrotaskQueueId = 0;
 
 CustomElementMicrotaskDispatcher::CustomElementMicrotaskDispatcher()
     : m_hasScheduledMicrotask(false)
     , m_phase(Quiescent)
     , m_resolutionAndImports(CustomElementMicrotaskQueue::create())
 {
 }
 
 CustomElementMicrotaskDispatcher& CustomElementMicrotaskDispatcher::instance()
 {
+#if ENABLE(OILPAN)
+    DEFINE_STATIC_LOCAL(Persistent<CustomElementMicrotaskDispatcher>, instance, (new CustomElementMicrotaskDispatcher()));
+    return *instance;
+#else
     DEFINE_STATIC_LOCAL(CustomElementMicrotaskDispatcher, instance, ());
     return instance;
+#endif

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

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

[sof, 2014/05/27 11:59:14]

Done, here & elsewhere.

(Where does this style come from? Seems like a recent change in preference..and
it can be tidied up a bit further by way of a macro, I think. But for later.)

 }
 
-void CustomElementMicrotaskDispatcher::enqueue(HTMLImportLoader* importLoader, PassOwnPtr<CustomElementMicrotaskStep> step)
+void CustomElementMicrotaskDispatcher::enqueue(HTMLImportLoader* importLoader, PassOwnPtrWillBeRawPtr<CustomElementMicrotaskStep> step)
 {
     ASSERT(m_phase == Quiescent || m_phase == DispatchingCallbacks);
     ensureMicrotaskScheduled();
     if (importLoader)
         importLoader->microtaskQueue()->enqueue(step);
     else
         m_resolutionAndImports->enqueue(step);
 }
 
 void CustomElementMicrotaskDispatcher::enqueue(CustomElementCallbackQueue* queue)
@@ skipping 32 matching lines @@
 
     // Finishing microtask work deletes all
     // CustomElementCallbackQueues. Being in a callback delivery scope
     // implies those queues could still be in use.
     ASSERT_WITH_SECURITY_IMPLICATION(!CustomElementCallbackDispatcher::inCallbackDeliveryScope());
 
     m_phase = Resolving;
     m_resolutionAndImports->dispatch();
 
     m_phase = DispatchingCallbacks;
-    for (Vector<CustomElementCallbackQueue*>::iterator it = m_elements.begin();it != m_elements.end(); ++it) {
+    for (WillBeHeapVector<RawPtrWillBeMember<CustomElementCallbackQueue> >::iterator it = m_elements.begin(); it != m_elements.end(); ++it) {
         // Created callback may enqueue an attached callback.
         CustomElementCallbackDispatcher::CallbackDeliveryScope scope;
         (*it)->processInElementQueue(kMicrotaskQueueId);
     }
 
     m_elements.clear();
     CustomElementScheduler::microtaskDispatcherDidFinish();
     m_phase = Quiescent;
 }
 
+void CustomElementMicrotaskDispatcher::trace(Visitor* visitor)
+{
+    visitor->trace(m_resolutionAndImports);
+#if ENABLE(OILPAN)
+    visitor->trace(m_elements);
+#endif
+}
+
 #if !defined(NDEBUG)
 void CustomElementMicrotaskDispatcher::show()
 {
     fprintf(stderr, "Dispatcher:\n");
     m_resolutionAndImports->show(1);
 }
 #endif
 
 } // namespace WebCore
 
 #if !defined(NDEBUG)
 void showCEMD()
 {
     WebCore::CustomElementMicrotaskDispatcher::instance().show();
 }
 #endif