Oilpan: Replace EAGERLY_FINALIZE in EventTarget's hierarchy with pre-finalizers

third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

 /*
  * Copyright (C) 2013 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 304 matching lines @@
     , m_sessionType(sessionType)
     , m_expiration(std::numeric_limits<double>::quiet_NaN())
     , m_keyStatusesMap(new MediaKeyStatusMap())
     , m_isUninitialized(true)
     , m_isCallable(false)
     , m_isClosed(false)
     , m_closedPromise(new ClosedPromise(scriptState->getExecutionContext(), this, ClosedPromise::Closed))
     , m_actionTimer(this, &MediaKeySession::actionTimerFired)
 {
     WTF_LOG(Media, "MediaKeySession(%p)::MediaKeySession", this);
+    ThreadState::current()->registerPreFinalizer(this);
 
     // Create the matching Chromium object. It will not be usable until
     // initializeNewSession() is called in response to the user calling
     // generateRequest().
     WebContentDecryptionModule* cdm = mediaKeys->contentDecryptionModule();
     m_session = adoptPtr(cdm->createSession());
     m_session->setClientInterface(this);
 
     // From https://w3c.github.io/encrypted-media/#createSession:
     // MediaKeys::createSession(), step 3.
@@ skipping 22 matching lines @@
     // use distinctive identifier.
     // FIXME: Implement this (http://crbug.com/448922).
 
     // 3.9 Let the cdm implementation value be this object's cdm implementation.
     // 3.10 Let the cdm instance value be this object's cdm instance.
 }
 
 MediaKeySession::~MediaKeySession()
 {
     WTF_LOG(Media, "MediaKeySession(%p)::~MediaKeySession", this);
+}
+
+void MediaKeySession::dispose()
+{
+    // Promptly clears a raw reference from content/ to an on-heap object
+    // so that content/ doesn't access it in a lazy sweeping phase.
     m_session.clear();
-#if !ENABLE(OILPAN)
-    // MediaKeySession and m_asyncEventQueue always become unreachable
-    // together. So MediaKeySession and m_asyncEventQueue are destructed in the
-    // same GC. We don't need to call cancelAllEvents explicitly in Oilpan.
-    m_asyncEventQueue->cancelAllEvents();
-#endif
 }
 
 String MediaKeySession::sessionId() const
 {
     return m_session->sessionId();
 }
 
 ScriptPromise MediaKeySession::closed(ScriptState* scriptState)
 {
     return m_closedPromise->promise(scriptState->world());
@@ skipping 538 matching lines @@
     visitor->trace(m_asyncEventQueue);
     visitor->trace(m_pendingActions);
     visitor->trace(m_mediaKeys);
     visitor->trace(m_keyStatusesMap);
     visitor->trace(m_closedPromise);
     RefCountedGarbageCollectedEventTargetWithInlineData<MediaKeySession>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink