<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[199846] trunk/Source/WebKit/mac</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/199846">199846</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-04-21 16:56:03 -0700 (Thu, 21 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK1] Add WebPlaybackSession support to WebKit
https://bugs.webkit.org/show_bug.cgi?id=156854
Reviewed by Beth Dakin.
Add support for WebPlaybackSession and the ChromeClient methods setUpPlaybackControlsManager() and
clearPlaybackControlsManager() to WebKit.
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::setUpPlaybackControlsManager):
(WebChromeClient::clearPlaybackControlsManager):
* WebView/WebView.mm:
(-[WebView _hasActiveVideoForControlsInterface]):
(-[WebView _setUpPlaybackControlsManagerForMediaElement:]):
(-[WebView _clearPlaybackControlsManagerForMediaElement:]):
* WebView/WebViewData.h:
* WebView/WebViewData.mm:
* WebView/WebViewInternal.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewDatah">trunk/Source/WebKit/mac/WebView/WebViewData.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewDatamm">trunk/Source/WebKit/mac/WebView/WebViewData.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewInternalh">trunk/Source/WebKit/mac/WebView/WebViewInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (199845 => 199846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-04-21 23:30:36 UTC (rev 199845)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-04-21 23:56:03 UTC (rev 199846)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-04-21 Jer Noble <jer.noble@apple.com>
+
+ [WK1] Add WebPlaybackSession support to WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=156854
+
+ Reviewed by Beth Dakin.
+
+ Add support for WebPlaybackSession and the ChromeClient methods setUpPlaybackControlsManager() and
+ clearPlaybackControlsManager() to WebKit.
+
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::setUpPlaybackControlsManager):
+ (WebChromeClient::clearPlaybackControlsManager):
+ * WebView/WebView.mm:
+ (-[WebView _hasActiveVideoForControlsInterface]):
+ (-[WebView _setUpPlaybackControlsManagerForMediaElement:]):
+ (-[WebView _clearPlaybackControlsManagerForMediaElement:]):
+ * WebView/WebViewData.h:
+ * WebView/WebViewData.mm:
+ * WebView/WebViewInternal.h:
+
</ins><span class="cx"> 2016-04-21 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop using ApplicationCacheStorage::singleton() in WebKitLegacy
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (199845 => 199846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2016-04-21 23:30:36 UTC (rev 199845)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2016-04-21 23:56:03 UTC (rev 199846)
</span><span class="lines">@@ -175,6 +175,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><ins>+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ void setUpPlaybackControlsManager(WebCore::HTMLMediaElement&) override;
+ void clearPlaybackControlsManager(WebCore::HTMLMediaElement&) override;
+#endif
+
</ins><span class="cx"> bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
</span><span class="cx"> void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
</span><span class="cx"> void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (199845 => 199846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2016-04-21 23:30:36 UTC (rev 199845)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2016-04-21 23:56:03 UTC (rev 199846)
</span><span class="lines">@@ -909,7 +909,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>-
</del><span class="cx"> bool WebChromeClient::supportsVideoFullscreen(HTMLMediaElementEnums::VideoFullscreenMode)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -934,8 +933,19 @@
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
</del><ins>+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+void WebChromeClient::setUpPlaybackControlsManager(HTMLMediaElement& element)
+{
+ [m_webView _setUpPlaybackControlsManagerForMediaElement:element];
+}
</ins><span class="cx">
</span><ins>+void WebChromeClient::clearPlaybackControlsManager(HTMLMediaElement& element)
+{
+ [m_webView _clearPlaybackControlsManagerForMediaElement:element];
+}
+#endif // PLATFORM(MAC)
+#endif // ENABLE(VIDEO)
+
</ins><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::supportsFullScreenForElement(const Element* element, bool withKeyboard)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (199845 => 199846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-04-21 23:30:36 UTC (rev 199845)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-04-21 23:56:03 UTC (rev 199846)
</span><span class="lines">@@ -301,6 +301,11 @@
</span><span class="cx"> #import <WebKitAdditions/WebViewIncludes.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+#import <WebCore/WebPlaybackSessionInterfaceMac.h>
+#import <WebCore/WebPlaybackSessionModelMediaElement.h>
+#endif
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUNotificationPopoverWillClose, NSString *)
</span><span class="cx"> #endif
</span><span class="lines">@@ -8517,6 +8522,50 @@
</span><span class="cx"> _private->fullscreenController = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+- (BOOL)_hasActiveVideoForControlsInterface
+{
+ if (!_private->playbackSessionModel)
+ return false;
+
+ HTMLMediaElement* mediaElement = _private->playbackSessionModel->mediaElement();
+ if (!mediaElement)
+ return false;
+
+ return mediaElement->hasAudio() || mediaElement->hasVideo();
+}
+
+- (void)_setUpPlaybackControlsManagerForMediaElement:(WebCore::HTMLMediaElement&)mediaElement
+{
+ if (_private->playbackSessionModel && _private->playbackSessionModel->mediaElement() == &mediaElement)
+ return;
+
+ if (!_private->playbackSessionModel)
+ _private->playbackSessionModel = WebPlaybackSessionModelMediaElement::create();
+ _private->playbackSessionModel->setMediaElement(&mediaElement);
+
+ if (!_private->playbackSessionInterface)
+ _private->playbackSessionInterface = WebPlaybackSessionInterfaceMac::create();
+
+ _private->playbackSessionInterface->setWebPlaybackSessionModel(_private->playbackSessionModel.get());
+ _private->playbackSessionModel->setWebPlaybackSessionInterface(_private->playbackSessionInterface.get());
+ [self updateWebViewAdditions];
+}
+
+- (void)_clearPlaybackControlsManagerForMediaElement:(WebCore::HTMLMediaElement&)mediaElement
+{
+ if (!_private->playbackSessionModel || _private->playbackSessionModel->mediaElement() != &mediaElement)
+ return;
+
+ _private->playbackSessionModel->setMediaElement(nullptr);
+ _private->playbackSessionModel->setWebPlaybackSessionInterface(nullptr);
+ _private->playbackSessionInterface->setWebPlaybackSessionModel(nullptr);
+
+ _private->playbackSessionModel = nullptr;
+ _private->playbackSessionInterface = nullptr;
+ [self updateWebViewAdditions];
+}
+#endif // PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</ins><span class="cx"> #endif // ENABLE(VIDEO)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API) && !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewData.h (199845 => 199846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewData.h 2016-04-21 23:30:36 UTC (rev 199845)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.h 2016-04-21 23:56:03 UTC (rev 199846)
</span><span class="lines">@@ -48,6 +48,10 @@
</span><span class="cx"> class HistoryItem;
</span><span class="cx"> class Page;
</span><span class="cx"> class TextIndicatorWindow;
</span><ins>+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+class WebPlaybackSessionInterfaceMac;
+class WebPlaybackSessionModelMediaElement;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @class WebImmediateActionController;
</span><span class="lines">@@ -288,6 +292,11 @@
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> WebVideoFullscreenController *fullscreenController;
</span><span class="cx"> #endif
</span><ins>+
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ RefPtr<WebCore::WebPlaybackSessionModelMediaElement> playbackSessionModel;
+ RefPtr<WebCore::WebPlaybackSessionInterfaceMac> playbackSessionInterface;
+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> WebFullScreenController *newFullscreenController;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewDatamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewData.mm (199845 => 199846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewData.mm 2016-04-21 23:30:36 UTC (rev 199845)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.mm 2016-04-21 23:56:03 UTC (rev 199846)
</span><span class="lines">@@ -49,6 +49,11 @@
</span><span class="cx"> #import "WebMediaPlaybackTargetPicker.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+#import <WebCore/WebPlaybackSessionInterfaceMac.h>
+#import <WebCore/WebPlaybackSessionModelMediaElement.h>
+#endif
+
</ins><span class="cx"> BOOL applicationIsTerminating = NO;
</span><span class="cx"> int pluginDatabaseClientCount = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewInternal.h (199845 => 199846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2016-04-21 23:30:36 UTC (rev 199845)
+++ trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2016-04-21 23:56:03 UTC (rev 199846)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> class Element;
</span><span class="cx"> class Event;
</span><span class="cx"> class Frame;
</span><ins>+class HTMLMediaElement;
</ins><span class="cx"> class HTMLVideoElement;
</span><span class="cx"> class HistoryItem;
</span><span class="cx"> class KeyboardEvent;
</span><span class="lines">@@ -251,7 +252,12 @@
</span><span class="cx"> #if ENABLE(VIDEO) && defined(__cplusplus)
</span><span class="cx"> - (void)_enterVideoFullscreenForVideoElement:(WebCore::HTMLVideoElement*)videoElement mode:(WebCore::HTMLMediaElementEnums::VideoFullscreenMode)mode;
</span><span class="cx"> - (void)_exitVideoFullscreen;
</span><ins>+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+- (BOOL)_hasActiveVideoForControlsInterface;
+- (void)_setUpPlaybackControlsManagerForMediaElement:(WebCore::HTMLMediaElement&)mediaElement;
+- (void)_clearPlaybackControlsManagerForMediaElement:(WebCore::HTMLMediaElement&)mediaElement;
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API) && !PLATFORM(IOS) && defined(__cplusplus)
</span><span class="cx"> - (BOOL)_supportsFullScreenForElement:(WebCore::Element*)element withKeyboard:(BOOL)withKeyboard;
</span></span></pre>
</div>
</div>
</body>
</html>