Changeset 220504 in webkit

Timestamp:

Aug 9, 2017 7:11:47 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Invalidate PlaybackSessionManager in same fashion as VideoFullscreenManager.
​https://bugs.webkit.org/show_bug.cgi?id=175399
rdar://problem/33663344

Patch by Jeremy Jones <​jeremyj@apple.com> on 2017-08-09
Reviewed by Eric Carlson.

Invalidate PlaybackSessionManager when WebPage is destructed.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::~WebPage):

• WebProcess/cocoa/PlaybackSessionManager.h:
• WebProcess/cocoa/PlaybackSessionManager.mm:

(WebKit::PlaybackSessionManager::~PlaybackSessionManager):
(WebKit::PlaybackSessionManager::invalidate):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/cocoa/PlaybackSessionManager.h (modified) (1 diff)
• WebProcess/cocoa/PlaybackSessionManager.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-08-09  Jeremy Jones  <jeremyj@apple.com>
+
+        Invalidate PlaybackSessionManager in same fashion as VideoFullscreenManager.
+        https://bugs.webkit.org/show_bug.cgi?id=175399
+        rdar://problem/33663344
+
+        Reviewed by Eric Carlson.
+
+        Invalidate PlaybackSessionManager when WebPage is destructed.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::~WebPage):
+        * WebProcess/cocoa/PlaybackSessionManager.h:
+        * WebProcess/cocoa/PlaybackSessionManager.mm:
+        (WebKit::PlaybackSessionManager::~PlaybackSessionManager):
+        (WebKit::PlaybackSessionManager::invalidate):
+
 2017-08-09  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -674 +674 @@
     
 #if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
+    if (m_playbackSessionManager)
+        m_playbackSessionManager->invalidate();
+
     if (m_videoFullscreenManager)
         m_videoFullscreenManager->invalidate();

trunk/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.h

@@ -100 +100 @@
     static Ref<PlaybackSessionManager> create(WebPage&);
     virtual ~PlaybackSessionManager();
+    
+    void invalidate();
 
     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;

trunk/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm

@@ -185 +185 @@
     m_clientCounts.clear();
 
+    if (m_page)
+        WebProcess::singleton().removeMessageReceiver(Messages::PlaybackSessionManager::messageReceiverName(), m_page->pageID());
+}
+
+void PlaybackSessionManager::invalidate()
+{
+    ASSERT(m_page);
     WebProcess::singleton().removeMessageReceiver(Messages::PlaybackSessionManager::messageReceiverName(), m_page->pageID());
+    m_page = nullptr;
 }