Changeset 186538 in webkit
- Timestamp:
- Jul 8, 2015 4:46:16 PM (9 years ago)
- Location:
- trunk/Source
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/page/ChromeClient.h
r185929 r186538 420 420 421 421 #if ENABLE(MEDIA_SESSION) 422 virtual void hasMediaSessionWithActiveMediaElementsDidChange(bool) { } 422 423 virtual void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) { } 423 424 #endif -
trunk/Source/WebKit2/ChangeLog
r186535 r186538 1 2015-07-08 Matt Rajca <mrajca@apple.com> 2 3 Media Session: indicate to clients whether a media session has active media elements 4 https://bugs.webkit.org/show_bug.cgi?id=146742 5 6 Reviewed by Tim Horton. 7 8 * UIProcess/API/C/WKPage.cpp: 9 (WKPageHasMediaSessionWithActiveMediaElements): 10 * UIProcess/API/C/WKPagePrivate.h: 11 * UIProcess/WebPageProxy.cpp: 12 (WebKit::WebPageProxy::hasMediaSessionWithActiveMediaElementsDidChange): 13 * UIProcess/WebPageProxy.h: 14 (WebKit::WebPageProxy::hasMediaSessionWithActiveMediaElementsDidChange): 15 * UIProcess/WebPageProxy.messages.in: 16 * WebProcess/WebCoreSupport/WebChromeClient.cpp: 17 (WebKit::WebChromeClient::hasMediaSessionWithActiveMediaElementsDidChange): 18 * WebProcess/WebCoreSupport/WebChromeClient.h: 19 1 20 2015-07-07 Matt Rajca <mrajca@apple.com> 2 21 -
trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp
r186484 r186538 2154 2154 } 2155 2155 2156 bool WKPageHasMediaSessionWithActiveMediaElements(WKPageRef page) 2157 { 2158 #if ENABLE(MEDIA_SESSION) 2159 return toImpl(page)->hasMediaSessionWithActiveMediaElements(); 2160 #else 2161 UNUSED_PARAM(page); 2162 return false; 2163 #endif 2164 } 2165 2156 2166 void WKPageHandleMediaEvent(WKPageRef page, WKMediaEventType wkEventType) 2157 2167 { -
trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h
r185477 r186538 119 119 typedef uint32_t WKMediaEventType; 120 120 121 WK_EXPORT bool WKPageHasMediaSessionWithActiveMediaElements(WKPageRef page); 121 122 WK_EXPORT void WKPageHandleMediaEvent(WKPageRef page, WKMediaEventType event); 122 123 -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r186484 r186538 5810 5810 5811 5811 #if ENABLE(MEDIA_SESSION) 5812 void WebPageProxy::hasMediaSessionWithActiveMediaElementsDidChange(bool state) 5813 { 5814 m_hasMediaSessionWithActiveMediaElements = state; 5815 } 5816 5812 5817 void WebPageProxy::mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata& metadata) 5813 5818 { -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r186371 r186538 941 941 942 942 #if ENABLE(MEDIA_SESSION) 943 bool hasMediaSessionWithActiveMediaElements() const { return m_hasMediaSessionWithActiveMediaElements; } 943 944 void handleMediaEvent(WebCore::MediaEventType); 944 945 #endif … … 1026 1027 1027 1028 #if ENABLE(MEDIA_SESSION) 1029 void hasMediaSessionWithActiveMediaElementsDidChange(bool); 1028 1030 void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&); 1029 1031 #endif … … 1763 1765 WebCore::MediaProducer::MediaStateFlags m_mediaState { WebCore::MediaProducer::IsNotPlaying }; 1764 1766 1767 #if ENABLE(MEDIA_SESSION) 1768 bool m_hasMediaSessionWithActiveMediaElements { false }; 1769 #endif 1770 1765 1771 #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS) 1766 1772 bool m_requiresTargetMonitoring { false }; -
trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in
r186082 r186538 426 426 427 427 #if ENABLE(MEDIA_SESSION) 428 HasMediaSessionWithActiveMediaElementsDidChange(bool state) 428 429 MediaSessionMetadataDidChange(WebCore::MediaSessionMetadata metadata); 429 430 #endif -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
r185929 r186538 1063 1063 1064 1064 #if ENABLE(MEDIA_SESSION) 1065 void WebChromeClient::hasMediaSessionWithActiveMediaElementsDidChange(bool state) 1066 { 1067 m_page->send(Messages::WebPageProxy::HasMediaSessionWithActiveMediaElementsDidChange(state)); 1068 } 1069 1065 1070 void WebChromeClient::mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata& metadata) 1066 1071 { -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
r185929 r186538 296 296 297 297 #if ENABLE(MEDIA_SESSION) 298 virtual void hasMediaSessionWithActiveMediaElementsDidChange(bool) override; 298 299 virtual void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) override; 299 300 #endif
Note: See TracChangeset
for help on using the changeset viewer.