Chromium Code Reviews| Index: third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h |
| diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h |
| index 674729dea19bbbcaa475705ec8a8ad233fea48aa..491b9996019ee62212e8e1bd276c1b5c3603ff09 100644 |
| --- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h |
| +++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h |
| @@ -67,6 +67,7 @@ class MediaKeySession final |
| REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(MediaKeySession); |
| DEFINE_WRAPPERTYPEINFO(); |
| USING_GARBAGE_COLLECTED_MIXIN(MediaKeySession); |
| + USING_PRE_FINALIZER(MediaKeySession, dispose); |
| public: |
| static MediaKeySession* create(ScriptState*, MediaKeys*, WebEncryptedMediaSessionType); |
| ~MediaKeySession() override; |
| @@ -93,9 +94,6 @@ public: |
| // ActiveDOMObject |
| void stop() override; |
| - // Oilpan: eagerly release owned m_session, which in turn |
|
sof
2016/04/11 06:23:32
It is worth preserving these EAGERLY_FINALIZE() co
|
| - // drops the client reference back to this MediaKeySession object. |
| - EAGERLY_FINALIZE(); |
| DECLARE_VIRTUAL_TRACE(); |
| private: |
| @@ -104,6 +102,7 @@ private: |
| friend class LoadSessionResultPromise; |
| MediaKeySession(ScriptState*, MediaKeys*, WebEncryptedMediaSessionType); |
| + void dispose(); |
| void actionTimerFired(Timer<MediaKeySession>*); |