Changeset 185929 in webkit

Timestamp:

Jun 24, 2015 3:36:07 PM (9 years ago)

Author:

mrajca@apple.com

Message:

MediaSession: propagate MediaSessionMetadata to WebPageProxy
​https://bugs.webkit.org/show_bug.cgi?id=146282

Reviewed by Darin Adler and Tim Horton.

WebCore:

• Modules/mediasession/MediaSession.cpp:

(WebCore::MediaSession::setMetadata):

WebKit2:

• Shared/WebCoreArgumentCoders.cpp: Added ArgumentEncoder support for MediaSessionMetadata so we can send it through the web page proxy.

(IPC::ArgumentCoder<MediaSessionMetadata>::encode):
(IPC::ArgumentCoder<MediaSessionMetadata>::decode):

• Shared/WebCoreArgumentCoders.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::mediaSessionMetadataDidChange):

• UIProcess/WebPageProxy.h: Receive mediaSessionMetadataDidChange in the web page proxy.
• UIProcess/WebPageProxy.messages.in: Added a new MediaSessionMetadataDidChange message.
• WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::mediaSessionMetadataDidChange): Push a mediaSessionMetadataDidChange message through the web page proxy.

• WebProcess/WebCoreSupport/WebChromeClient.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/mediasession/MediaSession.cpp (modified) (2 diffs)
• WebCore/page/ChromeClient.h (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/WebCoreArgumentCoders.cpp (modified) (2 diffs)
• WebKit2/Shared/WebCoreArgumentCoders.h (modified) (2 diffs)
• WebKit2/UIProcess/WebPageProxy.cpp (modified) (1 diff)
• WebKit2/UIProcess/WebPageProxy.h (modified) (2 diffs)
• WebKit2/UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-24  Matt Rajca  <mrajca@apple.com>
+
+        MediaSession: propagate MediaSessionMetadata to WebPageProxy
+        https://bugs.webkit.org/show_bug.cgi?id=146282
+
+        Reviewed by Darin Adler and Tim Horton.
+
+        * Modules/mediasession/MediaSession.cpp:
+        (WebCore::MediaSession::setMetadata):
+
 2015-06-24  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp

@@ -29 +29 @@
 #if ENABLE(MEDIA_SESSION)
 
+#include "Chrome.h"
+#include "ChromeClient.h"
 #include "Dictionary.h"
 #include "Event.h"
@@ -100 +102 @@
 
     m_metadata = MediaSessionMetadata(title, artist, album, artworkURL);
+
+    if (Page *page = m_document.page())
+        page->chrome().client().mediaSessionMetadataDidChange(m_metadata);
 }
 

trunk/Source/WebCore/page/ChromeClient.h

@@ -45 +45 @@
 #include <wtf/Forward.h>
 #include <wtf/Vector.h>
+
+#if ENABLE(MEDIA_SESSION)
+namespace WebCore {
+struct MediaSessionMetadata;
+}
+#endif
 
 #if PLATFORM(IOS)
@@ -413 +419 @@
     virtual void isPlayingMediaDidChange(MediaProducer::MediaStateFlags) { }
 
+#if ENABLE(MEDIA_SESSION)
+    virtual void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) { }
+#endif
+
     virtual void setPageActivityState(PageActivityState::Flags) { }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-24  Matt Rajca  <mrajca@apple.com>
+
+        MediaSession: propagate MediaSessionMetadata to WebPageProxy
+        https://bugs.webkit.org/show_bug.cgi?id=146282
+
+        Reviewed by Darin Adler and Tim Horton.
+
+        * Shared/WebCoreArgumentCoders.cpp: Added ArgumentEncoder support for MediaSessionMetadata so we can send it
+          through the web page proxy.
+        (IPC::ArgumentCoder<MediaSessionMetadata>::encode):
+        (IPC::ArgumentCoder<MediaSessionMetadata>::decode):
+        * Shared/WebCoreArgumentCoders.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::mediaSessionMetadataDidChange):
+        * UIProcess/WebPageProxy.h: Receive mediaSessionMetadataDidChange in the web page proxy.
+        * UIProcess/WebPageProxy.messages.in: Added a new MediaSessionMetadataDidChange message.
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::mediaSessionMetadataDidChange): Push a mediaSessionMetadataDidChange message through the web page proxy.
+        * WebProcess/WebCoreSupport/WebChromeClient.h:
+
 2015-06-24  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

@@ -88 +88 @@
 #endif
 
+#if ENABLE(MEDIA_SESSION)
+#include <WebCore/MediaSessionMetadata.h>
+#endif
+
 using namespace WebCore;
 using namespace WebKit;
@@ -1447 +1451 @@
 }
 
+#if ENABLE(MEDIA_SESSION)
+void ArgumentCoder<MediaSessionMetadata>::encode(ArgumentEncoder& encoder, const MediaSessionMetadata& result)
+{
+    encoder << result.artist();
+    encoder << result.album();
+    encoder << result.title();
+    encoder << result.artworkURL();
+}
+
+bool ArgumentCoder<MediaSessionMetadata>::decode(ArgumentDecoder& decoder, MediaSessionMetadata& result)
+{
+    String artist, album, title;
+    URL artworkURL;
+    if (!decoder.decode(artist))
+        return false;
+    if (!decoder.decode(album))
+        return false;
+    if (!decoder.decode(title))
+        return false;
+    if (!decoder.decode(artworkURL))
+        return false;
+    result = MediaSessionMetadata(title, artist, album, artworkURL);
+    return true;
+}
+#endif
+
 void ArgumentCoder<UserScript>::encode(ArgumentEncoder& encoder, const UserScript& userScript)
 {

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h

@@ -122 +122 @@
 #endif
 
+#if ENABLE(MEDIA_SESSION)
+namespace WebCore {
+struct MediaSessionMetadata;
+}
+#endif
+
 namespace IPC {
 
@@ -453 +459 @@
     static void encode(ArgumentEncoder&, const WebCore::ContentFilterUnblockHandler&);
     static bool decode(ArgumentDecoder&, WebCore::ContentFilterUnblockHandler&);
+};
+#endif
+
+#if ENABLE(MEDIA_SESSION)
+template<> struct ArgumentCoder<WebCore::MediaSessionMetadata> {
+    static void encode(ArgumentEncoder&, const WebCore::MediaSessionMetadata&);
+    static bool decode(ArgumentDecoder&, WebCore::MediaSessionMetadata&);
 };
 #endif

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -5771 +5771 @@
 }
 
+#if ENABLE(MEDIA_SESSION)
+void WebPageProxy::mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata& metadata)
+{
+}
+#endif
+
 #if PLATFORM(MAC)
 void WebPageProxy::removeNavigationGestureSnapshot()

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -120 +120 @@
 #endif
 
+#if ENABLE(MEDIA_SESSION)
+namespace WebCore {
+struct MediaSessionMetadata;
+}
+#endif
+
 namespace API {
 class ContextMenuClient;
@@ -1014 +1020 @@
     void isPlayingMediaDidChange(WebCore::MediaProducer::MediaStateFlags);
 
+#if ENABLE(MEDIA_SESSION)
+    void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&);
+#endif
+
 #if PLATFORM(MAC)
     void removeNavigationGestureSnapshot();

trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -424 +424 @@
     IsPlayingMediaDidChange(unsigned state)
 
+#if ENABLE(MEDIA_SESSION)
+    MediaSessionMetadataDidChange(WebCore::MediaSessionMetadata metadata);
+#endif
+
 #if PLATFORM(MAC)
     DidPerformImmediateActionHitTest(struct WebKit::WebHitTestResult::Data result, bool contentPreventsDefault, WebKit::UserData userData)

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

@@ -1062 +1062 @@
 }
 
+#if ENABLE(MEDIA_SESSION)
+void WebChromeClient::mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata& metadata)
+{
+    m_page->send(Messages::WebPageProxy::MediaSessionMetadataDidChange(metadata));
+}
+#endif
+
 void WebChromeClient::setPageActivityState(PageActivityState::Flags activityState)
 {

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h

@@ -295 +295 @@
     virtual void setPageActivityState(WebCore::PageActivityState::Flags) override;
 
+#if ENABLE(MEDIA_SESSION)
+    virtual void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) override;
+#endif
+
 #if ENABLE(SUBTLE_CRYPTO)
     virtual bool wrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const override;