<!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>[162360] trunk</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/162360">162360</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 11:23:40 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow MediaSessionManager to restrict 'preload' behavior
https://bugs.webkit.org/show_bug.cgi?id=127297
Reviewed by Jer Noble.
Source/WebCore:
Tests: media/video-restricted-no-preload-auto.html
media/video-restricted-no-preload-metadata.html
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute): Apply restrictions to preload attribute before
passing to media engine.
(WebCore::HTMLMediaElement::loadResource): Ditto.
* html/HTMLMediaSession.cpp:
(WebCore::HTMLMediaSession::effectivePreloadForElement): New, limit preload according to restrictions.
* html/HTMLMediaSession.h:
* platform/audio/MediaSessionManager.h:
* platform/audio/ios/MediaSessionManagerIOS.mm:
(WebCore::MediaSessionManageriOS::resetRestrictions): Limit preload to metadata only. Drive-by
static deviceClass initialization cleanup.
* testing/Internals.cpp:
(WebCore::Internals::setMediaSessionRestrictions): Support MetadataPreloadingNotPermitted and
AutoPreloadingNotPermitted.
LayoutTests:
* media/video-restricted-no-preload-auto-expected.txt: Added.
* media/video-restricted-no-preload-auto.html: Added.
* media/video-restricted-no-preload-metadata-expected.txt: Added.
* media/video-restricted-no-preload-metadata.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<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="#trunkSourceWebCorehtmlHTMLMediaSessioncpp">trunk/Source/WebCore/html/HTMLMediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaSessionh">trunk/Source/WebCore/html/HTMLMediaSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionManagerh">trunk/Source/WebCore/platform/audio/MediaSessionManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm">trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideorestrictednopreloadautoexpectedtxt">trunk/LayoutTests/media/video-restricted-no-preload-auto-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideorestrictednopreloadautohtml">trunk/LayoutTests/media/video-restricted-no-preload-auto.html</a></li>
<li><a href="#trunkLayoutTestsmediavideorestrictednopreloadmetadataexpectedtxt">trunk/LayoutTests/media/video-restricted-no-preload-metadata-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideorestrictednopreloadmetadatahtml">trunk/LayoutTests/media/video-restricted-no-preload-metadata.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162359 => 162360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-20 18:53:00 UTC (rev 162359)
+++ trunk/LayoutTests/ChangeLog 2014-01-20 19:23:40 UTC (rev 162360)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-20 Eric Carlson <eric.carlson@apple.com>
+
+ Allow MediaSessionManager to restrict 'preload' behavior
+ https://bugs.webkit.org/show_bug.cgi?id=127297
+
+ Reviewed by Jer Noble.
+
+ * media/video-restricted-no-preload-auto-expected.txt: Added.
+ * media/video-restricted-no-preload-auto.html: Added.
+ * media/video-restricted-no-preload-metadata-expected.txt: Added.
+ * media/video-restricted-no-preload-metadata.html: Added.
+
</ins><span class="cx"> 2014-01-20 Mihai Tica <mitica@adobe.com>
</span><span class="cx">
</span><span class="cx"> Fix test expectations for css3/compositing/background-blend-mode-data-uri-svg-image.html
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideorestrictednopreloadautoexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-restricted-no-preload-auto-expected.txt (0 => 162360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-restricted-no-preload-auto-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-restricted-no-preload-auto-expected.txt 2014-01-20 19:23:40 UTC (rev 162360)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+
+Test that "no auto-loading restriction" only allows metadata to load in spite of preload='auto'.
+
+** setting video.src
+EXPECTED (video.preload == 'auto') OK
+RUN(internals.setMediaSessionRestrictions('video', 'AutoPreloadingNotPermitted'))
+
+EVENT(loadedmetadata)
+EXPECTED (video.readyState < '2') OK
+** Pausing...
+
+
+** 250ms timer fired
+EXPECTED (video.readyState < '2') OK
+EXPECTED (video.buffered.length == '0') OK
+RUN(video.play())
+
+EVENT(canplaythrough)
+
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideorestrictednopreloadautohtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-restricted-no-preload-auto.html (0 => 162360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-restricted-no-preload-auto.html (rev 0)
+++ trunk/LayoutTests/media/video-restricted-no-preload-auto.html 2014-01-20 19:23:40 UTC (rev 162360)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+<html>
+ <head>
+ <script src="media-file.js"></script>
+ <script src="video-test.js"></script>
+ <script>
+ var playCalled = false;
+
+ function canplaythrough()
+ {
+ consoleWrite("");
+ if (!playCalled)
+ consoleWrite("*** FAIL: media data loaded before play() was called ***<br>");
+
+ endTest();
+ }
+
+ function play()
+ {
+ consoleWrite("** 250ms timer fired");
+ testExpected("video.readyState", HTMLMediaElement.HAVE_CURRENT_DATA, "<");
+ testExpected("video.buffered.length", 0, "==");
+ playCalled = true;
+ run("video.play()");
+ consoleWrite("");
+ }
+
+ function loadedmetadata()
+ {
+ testExpected("video.readyState", HTMLMediaElement.HAVE_CURRENT_DATA, "<");
+
+ // Wait 250ms before play()ing to make sure setting src did not kick off the load.
+ consoleWrite("** Pausing...<br>");
+ setTimeout(play, 250);
+ consoleWrite("");
+ }
+
+ function start()
+ {
+ if (!window.internals) {
+ failTest('This test requires window.internals.');
+ return;
+ }
+
+ findMediaElement();
+ consoleWrite("** setting video.src");
+ video.src = findMediaFile("video", "content/test");
+
+ testExpected("video.preload", "auto");
+ waitForEvent('loadedmetadata', loadedmetadata);
+ waitForEvent('canplaythrough', canplaythrough);
+ failTestIn(2000);
+ run("internals.setMediaSessionRestrictions('video', 'AutoPreloadingNotPermitted')");
+ consoleWrite("");
+ }
+ </script>
+ </head>
+
+ <body onload="start()">
+ <video controls preload=auto></video>
+ <p>Test that "no auto-loading restriction" only allows metadata to load in spite of preload='auto'.</p>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideorestrictednopreloadmetadataexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-restricted-no-preload-metadata-expected.txt (0 => 162360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-restricted-no-preload-metadata-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-restricted-no-preload-metadata-expected.txt 2014-01-20 19:23:40 UTC (rev 162360)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+
+Test that "no preloading restriction" disables preloading in spite of preload='auto'.
+
+** setting video.src
+EXPECTED (video.preload == 'auto') OK
+RUN(internals.setMediaSessionRestrictions('video', 'MetadataPreloadingNotPermitted'))
+** Pausing...
+
+** 250ms timer fired
+EXPECTED (video.readyState == '0') OK
+EXPECTED (video.buffered.length == '0') OK
+RUN(video.load())
+
+EVENT(loadedmetadata)
+
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideorestrictednopreloadmetadatahtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-restricted-no-preload-metadata.html (0 => 162360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-restricted-no-preload-metadata.html (rev 0)
+++ trunk/LayoutTests/media/video-restricted-no-preload-metadata.html 2014-01-20 19:23:40 UTC (rev 162360)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+<html>
+ <head>
+ <script src="media-file.js"></script>
+ <script src="video-test.js"></script>
+ <script>
+ var loadCalled = false;
+
+ function loadedmetadata()
+ {
+ consoleWrite("");
+ if (!loadCalled)
+ consoleWrite("*** FAIL: media data loaded before load() was called ***<br>");
+
+ endTest();
+ }
+
+ function load()
+ {
+ consoleWrite("** 250ms timer fired");
+ testExpected("video.readyState", HTMLMediaElement.HAVE_NOTHING);
+ testExpected("video.buffered.length", 0, "==");
+ loadCalled = true;
+ run("video.load()");
+ consoleWrite("");
+ }
+
+ function start()
+ {
+ if (!window.internals) {
+ failTest('This test requires window.internals.');
+ return;
+ }
+
+ findMediaElement();
+ consoleWrite("** setting video.src");
+ video.src = findMediaFile("video", "content/test");
+
+ testExpected("video.preload", "auto");
+ waitForEvent('loadedmetadata', loadedmetadata);
+ run("internals.setMediaSessionRestrictions('video', 'MetadataPreloadingNotPermitted')");
+
+ // Wait 250ms before load()ing to make sure setting src did not kick off the load.
+ consoleWrite("** Pausing...<br>");
+ setTimeout(load, 250);
+ failTestIn(2000);
+ }
+ </script>
+ </head>
+
+ <body onload="start()">
+ <video controls preload=auto></video>
+ <p>Test that "no preloading restriction" disables preloading in spite of preload='auto'.</p>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162359 => 162360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-20 18:53:00 UTC (rev 162359)
+++ trunk/Source/WebCore/ChangeLog 2014-01-20 19:23:40 UTC (rev 162360)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-01-20 Eric Carlson <eric.carlson@apple.com>
+
+ Allow MediaSessionManager to restrict 'preload' behavior
+ https://bugs.webkit.org/show_bug.cgi?id=127297
+
+ Reviewed by Jer Noble.
+
+ Tests: media/video-restricted-no-preload-auto.html
+ media/video-restricted-no-preload-metadata.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute): Apply restrictions to preload attribute before
+ passing to media engine.
+ (WebCore::HTMLMediaElement::loadResource): Ditto.
+
+ * html/HTMLMediaSession.cpp:
+ (WebCore::HTMLMediaSession::effectivePreloadForElement): New, limit preload according to restrictions.
+ * html/HTMLMediaSession.h:
+
+ * platform/audio/MediaSessionManager.h:
+ * platform/audio/ios/MediaSessionManagerIOS.mm:
+ (WebCore::MediaSessionManageriOS::resetRestrictions): Limit preload to metadata only. Drive-by
+ static deviceClass initialization cleanup.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::setMediaSessionRestrictions): Support MetadataPreloadingNotPermitted and
+ AutoPreloadingNotPermitted.
+
</ins><span class="cx"> 2014-01-20 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Let RenderImage construct its RenderImageResource.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (162359 => 162360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-01-20 18:53:00 UTC (rev 162359)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-01-20 19:23:40 UTC (rev 162360)
</span><span class="lines">@@ -546,7 +546,7 @@
</span><span class="cx">
</span><span class="cx"> // The attribute must be ignored if the autoplay attribute is present
</span><span class="cx"> if (!autoplay() && m_player)
</span><del>- m_player->setPreload(m_preload);
</del><ins>+ m_player->setPreload(m_mediaSession->effectivePreloadForElement(*this));
</ins><span class="cx">
</span><span class="cx"> } else if (name == mediagroupAttr)
</span><span class="cx"> setMediaGroup(value);
</span><span class="lines">@@ -987,12 +987,13 @@
</span><span class="cx"> // The spec doesn't say to block the load event until we actually run the asynchronous section
</span><span class="cx"> // algorithm, but do it now because we won't start that until after the timer fires and the
</span><span class="cx"> // event may have already fired by then.
</span><del>- if (m_preload != MediaPlayer::None)
</del><ins>+ MediaPlayer::Preload effectivePreload = m_mediaSession->effectivePreloadForElement(*this);
+ if (effectivePreload != MediaPlayer::None)
</ins><span class="cx"> setShouldDelayLoadEvent(true);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> Settings* settings = document().settings();
</span><del>- if (m_preload != MediaPlayer::None && settings && settings->mediaDataLoadsAutomatically())
</del><ins>+ if (effectivePreload != MediaPlayer::None && settings && settings->mediaDataLoadsAutomatically())
</ins><span class="cx"> prepareToPlay();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1211,7 +1212,7 @@
</span><span class="cx"> setDisplayMode(Unknown);
</span><span class="cx">
</span><span class="cx"> if (!autoplay())
</span><del>- m_player->setPreload(m_preload);
</del><ins>+ m_player->setPreload(m_mediaSession->effectivePreloadForElement(*this));
</ins><span class="cx"> m_player->setPreservesPitch(m_webkitPreservesPitch);
</span><span class="cx">
</span><span class="cx"> if (fastHasAttribute(mutedAttr))
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (162359 => 162360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-01-20 18:53:00 UTC (rev 162359)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-01-20 19:23:40 UTC (rev 162360)
</span><span class="lines">@@ -424,6 +424,8 @@
</span><span class="cx"> RefPtr<VideoPlaybackQuality> getVideoPlaybackQuality();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ MediaPlayer::Preload preloadValue() const { return m_preload; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> HTMLMediaElement(const QualifiedName&, Document&, bool);
</span><span class="cx"> virtual ~HTMLMediaElement();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaSession.cpp (162359 => 162360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaSession.cpp 2014-01-20 18:53:00 UTC (rev 162359)
+++ trunk/Source/WebCore/html/HTMLMediaSession.cpp 2014-01-20 19:23:40 UTC (rev 162360)
</span><span class="lines">@@ -143,6 +143,22 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+MediaPlayer::Preload HTMLMediaSession::effectivePreloadForElement(const HTMLMediaElement& element) const
+{
+ MediaSessionManager::SessionRestrictions restrictions = MediaSessionManager::sharedManager().restrictions(mediaType());
+ MediaPlayer::Preload preload = element.preloadValue();
+
+ if ((restrictions & MediaSessionManager::MetadataPreloadingNotPermitted) == MediaSessionManager::MetadataPreloadingNotPermitted)
+ return MediaPlayer::None;
+
+ if ((restrictions & MediaSessionManager::AutoPreloadingNotPermitted) == MediaSessionManager::AutoPreloadingNotPermitted) {
+ if (preload > MediaPlayer::MetaData)
+ return MediaPlayer::MetaData;
+ }
+
+ return preload;
+}
+
</ins><span class="cx"> void HTMLMediaSession::clientWillBeginPlayback() const
</span><span class="cx"> {
</span><span class="cx"> MediaSessionManager::sharedManager().sessionWillBeginPlayback(*this);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaSession.h (162359 => 162360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaSession.h 2014-01-20 18:53:00 UTC (rev 162359)
+++ trunk/Source/WebCore/html/HTMLMediaSession.h 2014-01-20 19:23:40 UTC (rev 162360)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx">
</span><ins>+#include "MediaPlayer.h"
</ins><span class="cx"> #include "MediaSession.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -52,6 +53,7 @@
</span><span class="cx"> bool showingPlaybackTargetPickerPermitted(const HTMLMediaElement&) const;
</span><span class="cx"> #endif
</span><span class="cx"> bool requiresFullscreenForVideoPlayback(const HTMLMediaElement&) const;
</span><ins>+ MediaPlayer::Preload effectivePreloadForElement(const HTMLMediaElement&) const;
</ins><span class="cx">
</span><span class="cx"> // Restrictions to modify default behaviors.
</span><span class="cx"> enum BehaviorRestrictionFlags {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.h (162359 => 162360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSessionManager.h 2014-01-20 18:53:00 UTC (rev 162359)
+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.h 2014-01-20 19:23:40 UTC (rev 162360)
</span><span class="lines">@@ -50,7 +50,9 @@
</span><span class="cx"> enum SessionRestrictionFlags {
</span><span class="cx"> NoRestrictions = 0,
</span><span class="cx"> ConcurrentPlaybackNotPermitted = 1 << 0,
</span><del>- InlineVideoPlaybackRestricted = 1 << 0,
</del><ins>+ InlineVideoPlaybackRestricted = 1 << 1,
+ MetadataPreloadingNotPermitted = 1 << 2,
+ AutoPreloadingNotPermitted = 1 << 3,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned SessionRestrictions;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (162359 => 162360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-01-20 18:53:00 UTC (rev 162359)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-01-20 19:23:40 UTC (rev 162360)
</span><span class="lines">@@ -79,12 +79,15 @@
</span><span class="cx"> {
</span><span class="cx"> MediaSessionManager::resetRestrictions();
</span><span class="cx">
</span><del>- DEFINE_STATIC_LOCAL(wkDeviceClass, deviceClass, (iosDeviceClass()));
-
</del><ins>+ static wkDeviceClass deviceClass = iosDeviceClass();
</ins><span class="cx"> if (deviceClass == wkDeviceClassiPhone || deviceClass == wkDeviceClassiPod)
</span><span class="cx"> addRestriction(MediaSession::Video, InlineVideoPlaybackRestricted);
</span><span class="cx">
</span><span class="cx"> addRestriction(MediaSession::Video, ConcurrentPlaybackNotPermitted);
</span><ins>+ removeRestriction(MediaSession::Audio, MetadataPreloadingNotPermitted);
+ removeRestriction(MediaSession::Video, MetadataPreloadingNotPermitted);
+ addRestriction(MediaSession::Audio, AutoPreloadingNotPermitted);
+ addRestriction(MediaSession::Video, AutoPreloadingNotPermitted);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (162359 => 162360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-01-20 18:53:00 UTC (rev 162359)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-01-20 19:23:40 UTC (rev 162360)
</span><span class="lines">@@ -2211,7 +2211,11 @@
</span><span class="cx"> restrictions = MediaSessionManager::ConcurrentPlaybackNotPermitted;
</span><span class="cx"> if (equalIgnoringCase(restrictionsString, "InlineVideoPlaybackRestricted"))
</span><span class="cx"> restrictions += MediaSessionManager::InlineVideoPlaybackRestricted;
</span><del>-
</del><ins>+ if (equalIgnoringCase(restrictionsString, "MetadataPreloadingNotPermitted"))
+ restrictions += MediaSessionManager::MetadataPreloadingNotPermitted;
+ if (equalIgnoringCase(restrictionsString, "AutoPreloadingNotPermitted"))
+ restrictions += MediaSessionManager::AutoPreloadingNotPermitted;
+
</ins><span class="cx"> MediaSessionManager::sharedManager().addRestriction(mediaType, restrictions);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>