Changeset 166101 in webkit

Timestamp:

Mar 21, 2014 3:21:29 PM (10 years ago)

Author:

eric.carlson@apple.com

Message:

[iOS] remote command callbacks must happen on the WebThread
​https://bugs.webkit.org/show_bug.cgi?id=130618

Reviewed by Jer Noble.

• platform/ios/RemoteCommandListenerIOS.h:

(WebCore::RemoteCommandListenerIOS::createWeakPtr):

• platform/ios/RemoteCommandListenerIOS.mm:

(WebCore::RemoteCommandListenerIOS::RemoteCommandListenerIOS): Dispatch commands to the

main thread before making listener callbacks.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/RemoteCommandListenerIOS.h (modified) (2 diffs)
• platform/ios/RemoteCommandListenerIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-21  Eric Carlson  <eric.carlson@apple.com>
+
+        [iOS] remote command callbacks must happen on the WebThread
+        https://bugs.webkit.org/show_bug.cgi?id=130618
+
+        Reviewed by Jer Noble.
+
+        * platform/ios/RemoteCommandListenerIOS.h:
+        (WebCore::RemoteCommandListenerIOS::createWeakPtr):
+        * platform/ios/RemoteCommandListenerIOS.mm:
+        (WebCore::RemoteCommandListenerIOS::RemoteCommandListenerIOS): Dispatch commands to the
+            main thread before making listener callbacks.
+
 2014-03-21  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.h

@@ -32 +32 @@
 
 #include <wtf/RetainPtr.h>
+#include <wtf/WeakPtr.h>
 
 #ifndef __OBJC__
@@ -45 +46 @@
 
 protected:
+    WeakPtr<RemoteCommandListenerIOS> createWeakPtr() { return m_weakPtrFactory.createWeakPtr(); }
+    
+    WeakPtrFactory<RemoteCommandListenerIOS> m_weakPtrFactory;
     RetainPtr<id> m_playTarget;
     RetainPtr<id> m_pauseTarget;

trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm

@@ -47 +47 @@
 RemoteCommandListenerIOS::RemoteCommandListenerIOS(RemoteCommandListenerClient& client)
     : RemoteCommandListener(client)
+    , m_weakPtrFactory(this)
 {
     MPRemoteCommandCenter *center = [getMPRemoteCommandCenterClass() sharedCommandCenter];
+    auto weakThis = createWeakPtr();
+    
+    m_pauseTarget = [[center pauseCommand] addTargetWithHandler:^(MPRemoteCommandEvent *) {
+        callOnMainThread([weakThis] {
+            if (!weakThis)
+                return;
+            weakThis->m_client.didReceiveRemoteControlCommand(MediaSession::PauseCommand);
+        });
 
-    m_pauseTarget = [[center pauseCommand] addTargetWithHandler:^(MPRemoteCommandEvent *) {
-        m_client.didReceiveRemoteControlCommand(MediaSession::PauseCommand);
         return MPRemoteCommandHandlerStatusSuccess;
     }];
+
     m_playTarget = [[center playCommand] addTargetWithHandler:^(MPRemoteCommandEvent *) {
-        m_client.didReceiveRemoteControlCommand(MediaSession::PlayCommand);
+        callOnMainThread([weakThis] {
+            if (!weakThis)
+                return;
+            weakThis->m_client.didReceiveRemoteControlCommand(MediaSession::PlayCommand);
+        });
+
         return MPRemoteCommandHandlerStatusSuccess;
     }];
+
     m_togglePlayPauseTarget = [[center togglePlayPauseCommand] addTargetWithHandler:^(MPRemoteCommandEvent *) {
-        m_client.didReceiveRemoteControlCommand(MediaSession::TogglePlayPauseCommand);
+        callOnMainThread([weakThis] {
+            if (!weakThis)
+                return;
+            weakThis->m_client.didReceiveRemoteControlCommand(MediaSession::TogglePlayPauseCommand);
+        });
+
         return MPRemoteCommandHandlerStatusSuccess;
     }];
+
     m_seekBackwardTarget = [[center seekBackwardCommand] addTargetWithHandler:^(MPRemoteCommandEvent *event) {
         ASSERT([event isKindOfClass:getMPSeekCommandEventClass()]);
+
         MPSeekCommandEvent* seekEvent = static_cast<MPSeekCommandEvent *>(event);
-        m_client.didReceiveRemoteControlCommand([seekEvent type] == MPSeekCommandEventTypeBeginSeeking ? MediaSession::BeginSeekingBackwardCommand : MediaSession::EndSeekingBackwardCommand);
+        MediaSession::RemoteControlCommandType command = [seekEvent type] == MPSeekCommandEventTypeBeginSeeking ? MediaSession::BeginSeekingBackwardCommand : MediaSession::EndSeekingBackwardCommand;
+
+        callOnMainThread([weakThis, command] {
+            if (!weakThis)
+                return;
+            weakThis->m_client.didReceiveRemoteControlCommand(command);
+        });
+
         return MPRemoteCommandHandlerStatusSuccess;
     }];
+    
     m_seekForwardTarget = [[center seekForwardCommand] addTargetWithHandler:^(MPRemoteCommandEvent *event) {
         ASSERT([event isKindOfClass:getMPSeekCommandEventClass()]);
         MPSeekCommandEvent* seekEvent = static_cast<MPSeekCommandEvent *>(event);
-        m_client.didReceiveRemoteControlCommand([seekEvent type] == MPSeekCommandEventTypeBeginSeeking ? MediaSession::BeginSeekingForwardCommand : MediaSession::EndSeekingForwardCommand);
+
+        MediaSession::RemoteControlCommandType command = [seekEvent type] == MPSeekCommandEventTypeBeginSeeking ? MediaSession::BeginSeekingForwardCommand : MediaSession::EndSeekingForwardCommand;
+
+        callOnMainThread([weakThis, command] {
+            if (!weakThis)
+                return;
+            weakThis->m_client.didReceiveRemoteControlCommand(command);
+        });
+
         return MPRemoteCommandHandlerStatusSuccess;
     }];