<!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>[201435] trunk/Source/WebCore</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/201435">201435</a></dd>
<dt>Author</dt> <dd>adachan@apple.com</dd>
<dt>Date</dt> <dd>2016-05-26 15:05:26 -0700 (Thu, 26 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add WebKitAdditions extension point in HTMLMediaElement.
https://bugs.webkit.org/show_bug.cgi?id=158097
Reviewed by Eric Carlson.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::shouldOverrideBackgroundLoadingRestriction):
We need to load data in the background if playing to wireless playback target.
(WebCore::HTMLMediaElement::fullscreenModeChanged):
Moved from header file.
* html/HTMLMediaElement.h:
* platform/audio/PlatformMediaSession.cpp:
(WebCore::PlatformMediaSession::clientWillPausePlayback):
The code to start m_clientDataBufferingTimer is also in visibilityChanged().
Moved that code to PlatformMediaSession::scheduleClientDataBufferingCheck() and call
that method here.
(WebCore::PlatformMediaSession::visibilityChanged):
Call PlatformMediaSession::scheduleClientDataBufferingCheck().
(WebCore::PlatformMediaSession::scheduleClientDataBufferingCheck):
Start m_clientDataBufferingTimer if it's not already active.
(WebCore::PlatformMediaSession::shouldOverrideBackgroundLoadingRestriction):
Call the client.
* platform/audio/PlatformMediaSession.h:
(WebCore::PlatformMediaSessionClient::shouldOverrideBackgroundLoadingRestriction):
* platform/audio/PlatformMediaSessionManager.cpp:
(WebCore::PlatformMediaSessionManager::sessionCanLoadMedia):
Call the new PlatformMediaSession::shouldOverrideBackgroundLoadingRestriction().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessioncpp">trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessionh">trunk/Source/WebCore/platform/audio/PlatformMediaSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessionManagercpp">trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201434 => 201435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-26 22:03:34 UTC (rev 201434)
+++ trunk/Source/WebCore/ChangeLog 2016-05-26 22:05:26 UTC (rev 201435)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-05-25 Ada Chan <adachan@apple.com>
+
+ Add WebKitAdditions extension point in HTMLMediaElement.
+ https://bugs.webkit.org/show_bug.cgi?id=158097
+
+ Reviewed by Eric Carlson.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::shouldOverrideBackgroundLoadingRestriction):
+ We need to load data in the background if playing to wireless playback target.
+ (WebCore::HTMLMediaElement::fullscreenModeChanged):
+ Moved from header file.
+ * html/HTMLMediaElement.h:
+
+ * platform/audio/PlatformMediaSession.cpp:
+ (WebCore::PlatformMediaSession::clientWillPausePlayback):
+ The code to start m_clientDataBufferingTimer is also in visibilityChanged().
+ Moved that code to PlatformMediaSession::scheduleClientDataBufferingCheck() and call
+ that method here.
+ (WebCore::PlatformMediaSession::visibilityChanged):
+ Call PlatformMediaSession::scheduleClientDataBufferingCheck().
+ (WebCore::PlatformMediaSession::scheduleClientDataBufferingCheck):
+ Start m_clientDataBufferingTimer if it's not already active.
+ (WebCore::PlatformMediaSession::shouldOverrideBackgroundLoadingRestriction):
+ Call the client.
+
+ * platform/audio/PlatformMediaSession.h:
+ (WebCore::PlatformMediaSessionClient::shouldOverrideBackgroundLoadingRestriction):
+
+ * platform/audio/PlatformMediaSessionManager.cpp:
+ (WebCore::PlatformMediaSessionManager::sessionCanLoadMedia):
+ Call the new PlatformMediaSession::shouldOverrideBackgroundLoadingRestriction().
+
</ins><span class="cx"> 2016-05-26 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Use std::atomic<> rather than OSAtomicIncrement in CARingBuffer.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (201434 => 201435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-05-26 22:03:34 UTC (rev 201434)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-05-26 22:05:26 UTC (rev 201435)
</span><span class="lines">@@ -152,6 +152,10 @@
</span><span class="cx"> #include <bindings/ScriptObject.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/HTMLMediaElementAdditions.cpp>
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static const double SeekRepeatDelay = 0.1;
</span><span class="lines">@@ -7024,6 +7028,23 @@
</span><span class="cx"> page->chrome().client().clearPlaybackControlsManager(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !USE(APPLE_INTERNAL_SDK)
+bool HTMLMediaElement::shouldOverrideBackgroundLoadingRestriction() const
+{
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+ if (isPlayingToWirelessPlaybackTarget())
+ return true;
+#endif
+
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void HTMLMediaElement::fullscreenModeChanged(VideoFullscreenMode mode)
+{
+ m_videoFullscreenMode = mode;
+}
</ins><span class="cx"> #endif
</span><ins>+
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (201434 => 201435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2016-05-26 22:03:34 UTC (rev 201434)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2016-05-26 22:05:26 UTC (rev 201435)
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx">
</span><span class="cx"> using MediaPlayerEnums::VideoFullscreenMode;
</span><span class="cx"> VideoFullscreenMode fullscreenMode() const { return m_videoFullscreenMode; }
</span><del>- virtual void fullscreenModeChanged(VideoFullscreenMode mode) { m_videoFullscreenMode = mode; }
</del><ins>+ virtual void fullscreenModeChanged(VideoFullscreenMode);
</ins><span class="cx">
</span><span class="cx"> void enterFullscreen(VideoFullscreenMode);
</span><span class="cx"> void enterFullscreen() override;
</span><span class="lines">@@ -757,6 +757,7 @@
</span><span class="cx"> bool canReceiveRemoteControlCommands() const override { return true; }
</span><span class="cx"> void didReceiveRemoteControlCommand(PlatformMediaSession::RemoteControlCommandType) override;
</span><span class="cx"> bool shouldOverrideBackgroundPlaybackRestriction(PlatformMediaSession::InterruptionType) const override;
</span><ins>+ bool shouldOverrideBackgroundLoadingRestriction() const override;
</ins><span class="cx">
</span><span class="cx"> void pageMutedStateDidChange() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp (201434 => 201435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp 2016-05-26 22:03:34 UTC (rev 201434)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp 2016-05-26 22:05:26 UTC (rev 201435)
</span><span class="lines">@@ -186,8 +186,7 @@
</span><span class="cx">
</span><span class="cx"> setState(Paused);
</span><span class="cx"> PlatformMediaSessionManager::sharedManager().sessionWillEndPlayback(*this);
</span><del>- if (!m_clientDataBufferingTimer.isActive())
- m_clientDataBufferingTimer.startOneShot(kClientDataBufferingTimerThrottleDelay);
</del><ins>+ scheduleClientDataBufferingCheck();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -248,6 +247,11 @@
</span><span class="cx">
</span><span class="cx"> void PlatformMediaSession::visibilityChanged()
</span><span class="cx"> {
</span><ins>+ scheduleClientDataBufferingCheck();
+}
+
+void PlatformMediaSession::scheduleClientDataBufferingCheck()
+{
</ins><span class="cx"> if (!m_clientDataBufferingTimer.isActive())
</span><span class="cx"> m_clientDataBufferingTimer.startOneShot(kClientDataBufferingTimerThrottleDelay);
</span><span class="cx"> }
</span><span class="lines">@@ -283,6 +287,11 @@
</span><span class="cx"> return m_client.elementIsHidden();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool PlatformMediaSession::shouldOverrideBackgroundLoadingRestriction() const
+{
+ return m_client.shouldOverrideBackgroundLoadingRestriction();
+}
+
</ins><span class="cx"> void PlatformMediaSession::isPlayingToWirelessPlaybackTargetChanged(bool isWireless)
</span><span class="cx"> {
</span><span class="cx"> if (isWireless == m_isPlayingToWirelessPlaybackTarget)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSession.h (201434 => 201435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSession.h 2016-05-26 22:03:34 UTC (rev 201434)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSession.h 2016-05-26 22:05:26 UTC (rev 201435)
</span><span class="lines">@@ -137,6 +137,8 @@
</span><span class="cx">
</span><span class="cx"> bool isHidden() const;
</span><span class="cx">
</span><ins>+ bool shouldOverrideBackgroundLoadingRestriction() const;
+
</ins><span class="cx"> virtual bool canPlayToWirelessPlaybackTarget() const { return false; }
</span><span class="cx"> virtual bool isPlayingToWirelessPlaybackTarget() const { return m_isPlayingToWirelessPlaybackTarget; }
</span><span class="cx"> void isPlayingToWirelessPlaybackTargetChanged(bool);
</span><span class="lines">@@ -156,6 +158,8 @@
</span><span class="cx"> bool canProduceAudio() const { return m_canProduceAudio; }
</span><span class="cx"> void setCanProduceAudio(bool);
</span><span class="cx">
</span><ins>+ void scheduleClientDataBufferingCheck();
+
</ins><span class="cx"> protected:
</span><span class="cx"> PlatformMediaSessionClient& client() const { return m_client; }
</span><span class="cx">
</span><span class="lines">@@ -203,6 +207,7 @@
</span><span class="cx"> virtual bool elementIsHidden() const { return false; }
</span><span class="cx">
</span><span class="cx"> virtual bool shouldOverrideBackgroundPlaybackRestriction(PlatformMediaSession::InterruptionType) const = 0;
</span><ins>+ virtual bool shouldOverrideBackgroundLoadingRestriction() const { return false; }
</ins><span class="cx">
</span><span class="cx"> virtual void wirelessRoutesAvailableDidChange() { }
</span><span class="cx"> virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&) { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (201434 => 201435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2016-05-26 22:03:34 UTC (rev 201434)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2016-05-26 22:05:26 UTC (rev 201435)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx">
</span><span class="cx"> bool PlatformMediaSessionManager::sessionCanLoadMedia(const PlatformMediaSession& session) const
</span><span class="cx"> {
</span><del>- return session.state() == PlatformMediaSession::Playing || !session.isHidden() || session.isPlayingToWirelessPlaybackTarget();
</del><ins>+ return session.state() == PlatformMediaSession::Playing || !session.isHidden() || session.shouldOverrideBackgroundLoadingRestriction();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformMediaSessionManager::applicationWillEnterBackground() const
</span></span></pre>
</div>
</div>
</body>
</html>