Changeset 206288 in webkit

Timestamp:

Sep 22, 2016 7:10:59 PM (8 years ago)

Author:

bshafiei@apple.com

Message:

Merge r206193. rdar://problem/28376161

Location:

branches/safari-602-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webaudio/AudioContext.cpp (modified) (3 diffs)
• Modules/webaudio/AudioContext.h (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)
• html/HTMLMediaElement.h (modified) (1 diff)
• platform/audio/PlatformMediaSession.cpp (modified) (1 diff)
• platform/audio/PlatformMediaSession.h (modified) (2 diffs)
• platform/audio/mac/MediaSessionManagerMac.mm (modified) (4 diffs)
• platform/mac/MediaRemoteSoftLink.cpp (modified) (1 diff)
• platform/mac/MediaRemoteSoftLink.h (modified) (1 diff)

branches/safari-602-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-22  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r206193. rdar://problem/28376161
+
+    2016-09-20  Jer Noble  <jer.noble@apple.com>
+
+            Adopt MRMediaRemoteSetParentApplication.
+            https://bugs.webkit.org/show_bug.cgi?id=162259
+            <rdar://problem/28376161>
+
+            Reviewed by Anders Carlsson.
+
+            Allow MediaSessionManagerMac to retrieve the correct parent application identifier
+            from a PlatformMediaSession so that it can pass that identifier through to MediaRemote
+            via MRMediaRemoteSetParentApplication.
+
+            * Modules/webaudio/AudioContext.cpp:
+            (WebCore::AudioContext::sourceApplicationIdentifier):
+            * Modules/webaudio/AudioContext.h:
+            * platform/audio/PlatformMediaSession.cpp:
+            (WebCore::PlatformMediaSession::sourceApplicationIdentifier):
+            * platform/audio/PlatformMediaSession.h:
+            (WebCore::PlatformMediaSession::resetPlaybackSessionState): Deleted.
+            * platform/audio/mac/MediaSessionManagerMac.mm:
+            (WebCore::MediaSessionManagerMac::updateNowPlayingInfo):
+            * platform/mac/MediaRemoteSoftLink.cpp:
+            * platform/mac/MediaRemoteSoftLink.h:
+
+
 2016-09-22  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-602-branch/Source/WebCore/Modules/webaudio/AudioContext.cpp

@@ -49 +49 @@
 #include "ExceptionCode.h"
 #include "FFTFrame.h"
+#include "Frame.h"
 #include "GainNode.h"
 #include "GenericEventQueue.h"
@@ -54 +55 @@
 #include "HRTFPanner.h"
 #include "JSDOMPromise.h"
+#include "NetworkingContext.h"
 #include "OfflineAudioCompletionEvent.h"
 #include "OfflineAudioDestinationNode.h"
@@ -357 +359 @@
 }
 
+String AudioContext::sourceApplicationIdentifier() const
+{
+    Document* document = this->document();
+    if (Frame* frame = document ? document->frame() : nullptr) {
+        if (NetworkingContext* networkingContext = frame->loader().networkingContext())
+            return networkingContext->sourceApplicationIdentifier();
+    }
+    return emptyString();
+}
+
 RefPtr<AudioBuffer> AudioContext::createBuffer(unsigned numberOfChannels, size_t numberOfFrames, float sampleRate, ExceptionCode& ec)
 {

branches/safari-602-branch/Source/WebCore/Modules/webaudio/AudioContext.h

@@ -317 +317 @@
     void didReceiveRemoteControlCommand(PlatformMediaSession::RemoteControlCommandType) override { }
     bool shouldOverrideBackgroundPlaybackRestriction(PlatformMediaSession::InterruptionType) const override { return false; }
+    String sourceApplicationIdentifier() const override;
 
     // EventTarget

branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp

@@ -6509 +6509 @@
 }
 
-String HTMLMediaElement::mediaPlayerSourceApplicationIdentifier() const
+String HTMLMediaElement::sourceApplicationIdentifier() const
 {
     if (Frame* frame = document().frame()) {

branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.h

@@ -627 +627 @@
     bool mediaPlayerShouldWaitForResponseToAuthenticationChallenge(const AuthenticationChallenge&) override;
     void mediaPlayerHandlePlaybackCommand(PlatformMediaSession::RemoteControlCommandType command) override { didReceiveRemoteControlCommand(command); }
-    String mediaPlayerSourceApplicationIdentifier() const override;
+    String sourceApplicationIdentifier() const override;
+    String mediaPlayerSourceApplicationIdentifier() const override { return sourceApplicationIdentifier(); }
     Vector<String> mediaPlayerPreferredAudioCharacteristics() const override;
 

branches/safari-602-branch/Source/WebCore/platform/audio/PlatformMediaSession.cpp

@@ -285 +285 @@
 }
 
+String PlatformMediaSession::sourceApplicationIdentifier() const
+{
+    return m_client.sourceApplicationIdentifier();
+}
+
 bool PlatformMediaSession::isHidden() const
 {

branches/safari-602-branch/Source/WebCore/platform/audio/PlatformMediaSession.h

@@ -161 +161 @@
     void scheduleClientDataBufferingCheck();
     virtual void resetPlaybackSessionState() { }
+    String sourceApplicationIdentifier() const;
 
 protected:
@@ -218 +219 @@
 
     virtual const Document* hostingDocument() const = 0;
+    virtual String sourceApplicationIdentifier() const = 0;
 
 protected:

branches/safari-602-branch/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.mm

@@ -113 +113 @@
         return;
 
-    if (!MRMediaRemoteSetCanBeNowPlayingApplication(true)) {
-        LOG(Media, "MediaSessionManagerMac::updateNowPlayingInfo - MRMediaRemoteSetCanBeNowPlayingApplication(true) failed");
-        return;
-    }
-
     const PlatformMediaSession* currentSession = this->nowPlayingEligibleSession();
 
@@ -124 +119 @@
     if (!currentSession) {
         if (m_nowPlayingActive) {
+            MRMediaRemoteSetCanBeNowPlayingApplication(false);
             LOG(Media, "MediaSessionManagerMac::updateNowPlayingInfo - clearing now playing info");
             MRMediaRemoteSetNowPlayingInfo(nullptr);
@@ -136 +132 @@
         }
 
+        return;
+    }
+
+    if (!MRMediaRemoteSetCanBeNowPlayingApplication(true)) {
+        LOG(Media, "MediaSessionManagerMac::updateNowPlayingInfo - MRMediaRemoteSetCanBeNowPlayingApplication(true) failed");
         return;
     }
@@ -173 +174 @@
         title.utf8().data(), rate, duration, currentTime);
 
+    String parentApplication = currentSession->sourceApplicationIdentifier();
+    if (canLoad_MediaRemote_MRMediaRemoteSetParentApplication() && !parentApplication.isEmpty())
+        MRMediaRemoteSetParentApplication(MRMediaRemoteGetLocalOrigin(), parentApplication.createCFString().get());
+
     m_nowPlayingActive = true;
     MRPlaybackState playbackState = (currentSession->state() == PlatformMediaSession::Playing) ? kMRPlaybackStatePlaying : kMRPlaybackStatePaused;

branches/safari-602-branch/Source/WebCore/platform/mac/MediaRemoteSoftLink.cpp

@@ -43 +43 @@
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, MediaRemote, MRMediaRemoteSetNowPlayingInfo, void, (CFDictionaryRef info), (info))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, MediaRemote, MRMediaRemoteSetNowPlayingApplicationPlaybackStateForOrigin, void, (MROriginRef origin, MRPlaybackState playbackState, dispatch_queue_t replyQ, void(^completion)(MRMediaRemoteError)), (origin, playbackState, replyQ, completion))
+SOFT_LINK_FUNCTION_MAY_FAIL_FOR_SOURCE(WebCore, MediaRemote, MRMediaRemoteSetParentApplication, void, (MROriginRef origin, CFStringRef parentAppDisplayID), (origin, parentAppDisplayID))
 SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, MediaRemote, kMRMediaRemoteNowPlayingInfoTitle, CFStringRef);
 SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, MediaRemote, kMRMediaRemoteNowPlayingInfoDuration, CFStringRef);

branches/safari-602-branch/Source/WebCore/platform/mac/MediaRemoteSoftLink.h

@@ -54 +54 @@
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, MediaRemote, MRMediaRemoteSetNowPlayingApplicationPlaybackStateForOrigin, void, (MROriginRef origin, MRPlaybackState playbackState, dispatch_queue_t replyQ, void(^completion)(MRMediaRemoteError)), (origin, playbackState, replyQ, completion))
 #define MRMediaRemoteSetNowPlayingApplicationPlaybackStateForOrigin softLink_MediaRemote_MRMediaRemoteSetNowPlayingApplicationPlaybackStateForOrigin
+SOFT_LINK_FUNCTION_MAY_FAIL_FOR_HEADER(WebCore, MediaRemote, MRMediaRemoteSetParentApplication, void, (MROriginRef origin, CFStringRef parentAppDisplayID), (origin, parentAppDisplayID))
+#define MRMediaRemoteSetParentApplication softLink_MediaRemote_MRMediaRemoteSetParentApplication
 SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, MediaRemote, kMRMediaRemoteNowPlayingInfoTitle, CFStringRef);
 #define kMRMediaRemoteNowPlayingInfoTitle get_MediaRemote_kMRMediaRemoteNowPlayingInfoTitle()