Oilpan: merge MIDIAccessInitializer's prefinalizers.

Source/modules/webmidi/MIDIAccessInitializer.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 "modules/webmidi/MIDIAccessInitializer.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMError.h"
 #include "core/dom/Document.h"
 #include "core/frame/Navigator.h"
 #include "modules/webmidi/MIDIAccess.h"
 #include "modules/webmidi/MIDIController.h"
 #include "modules/webmidi/MIDIOptions.h"
 #include "modules/webmidi/MIDIPort.h"
 
 namespace blink {
 
 MIDIAccessInitializer::MIDIAccessInitializer(ScriptState* scriptState, const MIDIOptions& options)
     : ScriptPromiseResolver(scriptState)
     , m_requestSysex(false)
 {
 #if ENABLE(OILPAN)
+    // A prefinalizer has already been registered (as a LifecycleObserver);
+    // remove it and register a combined one, as the infrastructure doesn't
+    // support multiple prefinalizers for an object.

[haraken, 2015/01/28 09:53:10]

Shall we add a FIXME?

[sof, 2015/01/28 09:56:42]

Can do that, what did you have in mind? i.e., multiple prefinalizer support or
avoid there being multiple prefinalizers for MIDIAccessInitializer in the first
place?

[haraken, 2015/01/28 10:01:36]

Avoid multiple prefinalizers and add an ASSERT about it :)

[sof, 2015/01/28 10:56:38]

Done.

+    ThreadState::current()->unregisterPreFinalizer(*this);

[kouhei (in TOK), 2015/01/28 09:58:04]

How about
ThreadState::current()->unregisterPreFinalizer(static_cast<LifecycleObserver&>(*this));

(void*)(LifecycleObserver*)this may be != (void*)this

[sof, 2015/01/28 10:56:38]

Done.

     ThreadState::current()->registerPreFinalizer(*this);
 #endif
     if (options.hasSysex())
         m_requestSysex = options.sysex();
 }
 
 MIDIAccessInitializer::~MIDIAccessInitializer()
 {
 #if !ENABLE(OILPAN)
     dispose();
 #endif
 }
 
 void MIDIAccessInitializer::dispose()
 {
     // It is safe to cancel a request which is already finished or cancelled.
     Document* document = toDocument(executionContext());
     ASSERT(document);
     if (MIDIController* controller = MIDIController::from(document->frame()))
         controller->cancelSysexPermissionRequest(this);
+
+#if ENABLE(OILPAN)
+    // Delegate to LifecycleObserver's prefinalizer.
+    LifecycleObserver::dispose();
+#endif
 }
 
 ScriptPromise MIDIAccessInitializer::start()
 {
     ScriptPromise promise = this->promise();
     m_accessor = MIDIAccessor::create(this);
 
     if (!m_requestSysex) {
         m_accessor->startSession();
         return promise;
@@ skipping 56 matching lines @@
 {
     return executionContext()->securityOrigin();
 }
 
 ExecutionContext* MIDIAccessInitializer::executionContext() const
 {
     return scriptState()->executionContext();
 }
 
 } // namespace blink