Changeset 185929 in webkit
- Timestamp:
- Jun 24, 2015 3:36:07 PM (9 years ago)
- Location:
- trunk/Source
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r185927 r185929 1 2015-06-24 Matt Rajca <mrajca@apple.com> 2 3 MediaSession: propagate MediaSessionMetadata to WebPageProxy 4 https://bugs.webkit.org/show_bug.cgi?id=146282 5 6 Reviewed by Darin Adler and Tim Horton. 7 8 * Modules/mediasession/MediaSession.cpp: 9 (WebCore::MediaSession::setMetadata): 10 1 11 2015-06-24 Chris Dumez <cdumez@apple.com> 2 12 -
trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp
r185914 r185929 29 29 #if ENABLE(MEDIA_SESSION) 30 30 31 #include "Chrome.h" 32 #include "ChromeClient.h" 31 33 #include "Dictionary.h" 32 34 #include "Event.h" … … 100 102 101 103 m_metadata = MediaSessionMetadata(title, artist, album, artworkURL); 104 105 if (Page *page = m_document.page()) 106 page->chrome().client().mediaSessionMetadataDidChange(m_metadata); 102 107 } 103 108 -
trunk/Source/WebCore/page/ChromeClient.h
r185893 r185929 45 45 #include <wtf/Forward.h> 46 46 #include <wtf/Vector.h> 47 48 #if ENABLE(MEDIA_SESSION) 49 namespace WebCore { 50 struct MediaSessionMetadata; 51 } 52 #endif 47 53 48 54 #if PLATFORM(IOS) … … 413 419 virtual void isPlayingMediaDidChange(MediaProducer::MediaStateFlags) { } 414 420 421 #if ENABLE(MEDIA_SESSION) 422 virtual void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) { } 423 #endif 424 415 425 virtual void setPageActivityState(PageActivityState::Flags) { } 416 426 -
trunk/Source/WebKit2/ChangeLog
r185922 r185929 1 2015-06-24 Matt Rajca <mrajca@apple.com> 2 3 MediaSession: propagate MediaSessionMetadata to WebPageProxy 4 https://bugs.webkit.org/show_bug.cgi?id=146282 5 6 Reviewed by Darin Adler and Tim Horton. 7 8 * Shared/WebCoreArgumentCoders.cpp: Added ArgumentEncoder support for MediaSessionMetadata so we can send it 9 through the web page proxy. 10 (IPC::ArgumentCoder<MediaSessionMetadata>::encode): 11 (IPC::ArgumentCoder<MediaSessionMetadata>::decode): 12 * Shared/WebCoreArgumentCoders.h: 13 * UIProcess/WebPageProxy.cpp: 14 (WebKit::WebPageProxy::mediaSessionMetadataDidChange): 15 * UIProcess/WebPageProxy.h: Receive mediaSessionMetadataDidChange in the web page proxy. 16 * UIProcess/WebPageProxy.messages.in: Added a new MediaSessionMetadataDidChange message. 17 * WebProcess/WebCoreSupport/WebChromeClient.cpp: 18 (WebKit::WebChromeClient::mediaSessionMetadataDidChange): Push a mediaSessionMetadataDidChange message through the web page proxy. 19 * WebProcess/WebCoreSupport/WebChromeClient.h: 20 1 21 2015-06-24 Said Abou-Hallawa <sabouhallawa@apple.com> 2 22 -
trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
r185804 r185929 88 88 #endif 89 89 90 #if ENABLE(MEDIA_SESSION) 91 #include <WebCore/MediaSessionMetadata.h> 92 #endif 93 90 94 using namespace WebCore; 91 95 using namespace WebKit; … … 1447 1451 } 1448 1452 1453 #if ENABLE(MEDIA_SESSION) 1454 void ArgumentCoder<MediaSessionMetadata>::encode(ArgumentEncoder& encoder, const MediaSessionMetadata& result) 1455 { 1456 encoder << result.artist(); 1457 encoder << result.album(); 1458 encoder << result.title(); 1459 encoder << result.artworkURL(); 1460 } 1461 1462 bool ArgumentCoder<MediaSessionMetadata>::decode(ArgumentDecoder& decoder, MediaSessionMetadata& result) 1463 { 1464 String artist, album, title; 1465 URL artworkURL; 1466 if (!decoder.decode(artist)) 1467 return false; 1468 if (!decoder.decode(album)) 1469 return false; 1470 if (!decoder.decode(title)) 1471 return false; 1472 if (!decoder.decode(artworkURL)) 1473 return false; 1474 result = MediaSessionMetadata(title, artist, album, artworkURL); 1475 return true; 1476 } 1477 #endif 1478 1449 1479 void ArgumentCoder<UserScript>::encode(ArgumentEncoder& encoder, const UserScript& userScript) 1450 1480 { -
trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h
r182630 r185929 122 122 #endif 123 123 124 #if ENABLE(MEDIA_SESSION) 125 namespace WebCore { 126 struct MediaSessionMetadata; 127 } 128 #endif 129 124 130 namespace IPC { 125 131 … … 453 459 static void encode(ArgumentEncoder&, const WebCore::ContentFilterUnblockHandler&); 454 460 static bool decode(ArgumentDecoder&, WebCore::ContentFilterUnblockHandler&); 461 }; 462 #endif 463 464 #if ENABLE(MEDIA_SESSION) 465 template<> struct ArgumentCoder<WebCore::MediaSessionMetadata> { 466 static void encode(ArgumentEncoder&, const WebCore::MediaSessionMetadata&); 467 static bool decode(ArgumentDecoder&, WebCore::MediaSessionMetadata&); 455 468 }; 456 469 #endif -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r185878 r185929 5771 5771 } 5772 5772 5773 #if ENABLE(MEDIA_SESSION) 5774 void WebPageProxy::mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata& metadata) 5775 { 5776 } 5777 #endif 5778 5773 5779 #if PLATFORM(MAC) 5774 5780 void WebPageProxy::removeNavigationGestureSnapshot() -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r185878 r185929 120 120 #endif 121 121 122 #if ENABLE(MEDIA_SESSION) 123 namespace WebCore { 124 struct MediaSessionMetadata; 125 } 126 #endif 127 122 128 namespace API { 123 129 class ContextMenuClient; … … 1014 1020 void isPlayingMediaDidChange(WebCore::MediaProducer::MediaStateFlags); 1015 1021 1022 #if ENABLE(MEDIA_SESSION) 1023 void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&); 1024 #endif 1025 1016 1026 #if PLATFORM(MAC) 1017 1027 void removeNavigationGestureSnapshot(); -
trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in
r185877 r185929 424 424 IsPlayingMediaDidChange(unsigned state) 425 425 426 #if ENABLE(MEDIA_SESSION) 427 MediaSessionMetadataDidChange(WebCore::MediaSessionMetadata metadata); 428 #endif 429 426 430 #if PLATFORM(MAC) 427 431 DidPerformImmediateActionHitTest(struct WebKit::WebHitTestResult::Data result, bool contentPreventsDefault, WebKit::UserData userData) -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
r185893 r185929 1062 1062 } 1063 1063 1064 #if ENABLE(MEDIA_SESSION) 1065 void WebChromeClient::mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata& metadata) 1066 { 1067 m_page->send(Messages::WebPageProxy::MediaSessionMetadataDidChange(metadata)); 1068 } 1069 #endif 1070 1064 1071 void WebChromeClient::setPageActivityState(PageActivityState::Flags activityState) 1065 1072 { -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
r185893 r185929 295 295 virtual void setPageActivityState(WebCore::PageActivityState::Flags) override; 296 296 297 #if ENABLE(MEDIA_SESSION) 298 virtual void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) override; 299 #endif 300 297 301 #if ENABLE(SUBTLE_CRYPTO) 298 302 virtual bool wrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const override;
Note: See TracChangeset
for help on using the changeset viewer.