<!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>[167734] 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/167734">167734</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-04-23 18:23:58 -0700 (Wed, 23 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac, iOS] Stop buffering media when on an inactive tab.
https://bugs.webkit.org/show_bug.cgi?id=132077
Reviewed by Eric Carlson.
* html/HTMLMediaElement.cpp: Rename 'm_isDisplaySleepDisablingSuspended'
to 'm_elementIsHidden'.
(WebCore::HTMLMediaElement::HTMLMediaElement):
(WebCore::HTMLMediaElement::visibilityStatusChanged): Notify the
media session that the element is (or is not) hidden.
(WebCore::HTMLMediaElement::setShouldBufferData): Added.
* html/HTMLMediaElement.h:
* platform/audio/MediaSession.cpp:
(WebCore::MediaSession::clientWillBeginPlayback): Tell media to
buffer if not hidden or playing.
(WebCore::MediaSession::clientWillPausePlayback): Ditto.
(WebCore::MediaSession::visibilityChanged): Added. Client API, just relays call
to updateClientDataBuffering.
(WebCore::MediaSession::updateClientDataBuffering): Tell client it should only
buffer data if it's currently playing, or not hidden.
* platform/audio/MediaSession.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::setShouldBufferData): Added: Just relays to
MediaPlayerPrivate object.
* platform/graphics/MediaPlayer.h:
* platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::setShouldBufferData):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldBufferData): Added.
Detach the player item from the player if we don't want to continue
buffering or other background tasks.</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="#trunkSourceWebCoreplatformaudioMediaSessioncpp">trunk/Source/WebCore/platform/audio/MediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionh">trunk/Source/WebCore/platform/audio/MediaSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167733 => 167734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-24 00:43:15 UTC (rev 167733)
+++ trunk/Source/WebCore/ChangeLog 2014-04-24 01:23:58 UTC (rev 167734)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-04-23 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac, iOS] Stop buffering media when on an inactive tab.
+ https://bugs.webkit.org/show_bug.cgi?id=132077
+
+ Reviewed by Eric Carlson.
+
+ * html/HTMLMediaElement.cpp: Rename 'm_isDisplaySleepDisablingSuspended'
+ to 'm_elementIsHidden'.
+ (WebCore::HTMLMediaElement::HTMLMediaElement):
+ (WebCore::HTMLMediaElement::visibilityStatusChanged): Notify the
+ media session that the element is (or is not) hidden.
+ (WebCore::HTMLMediaElement::setShouldBufferData): Added.
+ * html/HTMLMediaElement.h:
+ * platform/audio/MediaSession.cpp:
+ (WebCore::MediaSession::clientWillBeginPlayback): Tell media to
+ buffer if not hidden or playing.
+ (WebCore::MediaSession::clientWillPausePlayback): Ditto.
+ (WebCore::MediaSession::visibilityChanged): Added. Client API, just relays call
+ to updateClientDataBuffering.
+ (WebCore::MediaSession::updateClientDataBuffering): Tell client it should only
+ buffer data if it's currently playing, or not hidden.
+ * platform/audio/MediaSession.h:
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::setShouldBufferData): Added: Just relays to
+ MediaPlayerPrivate object.
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::setShouldBufferData):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldBufferData): Added.
+ Detach the player item from the player if we don't want to continue
+ buffering or other background tasks.
+
</ins><span class="cx"> 2014-04-23 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Eliminate internals.setMockScrollbarsEnabled()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (167733 => 167734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-04-24 00:43:15 UTC (rev 167733)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-04-24 01:23:58 UTC (rev 167734)
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> , m_havePreparedToPlay(false)
</span><span class="cx"> , m_parsingInProgress(createdByParser)
</span><span class="cx"> #if ENABLE(PAGE_VISIBILITY_API)
</span><del>- , m_isDisplaySleepDisablingSuspended(document.hidden())
</del><ins>+ , m_elementIsHidden(document.hidden())
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_requestingPlay(false)
</span><span class="lines">@@ -4716,8 +4716,9 @@
</span><span class="cx"> void HTMLMediaElement::visibilityStateChanged()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "HTMLMediaElement::visibilityStateChanged");
</span><del>- m_isDisplaySleepDisablingSuspended = document().hidden();
</del><ins>+ m_elementIsHidden = document().hidden();
</ins><span class="cx"> updateSleepDisabling();
</span><ins>+ m_mediaSession->visibilityChanged();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -5682,7 +5683,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PAGE_VISIBILITY_API)
</span><del>- if (m_isDisplaySleepDisablingSuspended)
</del><ins>+ if (m_elementIsHidden)
</ins><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -6142,6 +6143,12 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+
+void HTMLMediaElement::setShouldBufferData(bool shouldBuffer)
+{
+ if (m_player)
+ return m_player->setShouldBufferData(shouldBuffer);
+}
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (167733 => 167734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-04-24 00:43:15 UTC (rev 167733)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-04-24 01:23:58 UTC (rev 167734)
</span><span class="lines">@@ -199,6 +199,7 @@
</span><span class="cx"> void setLoop(bool b);
</span><span class="cx"> virtual void play() override;
</span><span class="cx"> virtual void pause() override;
</span><ins>+ virtual void setShouldBufferData(bool) override;
</ins><span class="cx"> void fastSeek(double);
</span><span class="cx">
</span><span class="cx"> // captions
</span><span class="lines">@@ -206,6 +207,10 @@
</span><span class="cx"> bool webkitClosedCaptionsVisible() const;
</span><span class="cx"> void setWebkitClosedCaptionsVisible(bool);
</span><span class="cx">
</span><ins>+#if ENABLE(PAGE_VISIBILITY_API)
+ virtual bool elementIsHidden() const override { return m_elementIsHidden; }
+#endif
+
</ins><span class="cx"> #if ENABLE(MEDIA_STATISTICS)
</span><span class="cx"> // Statistics
</span><span class="cx"> unsigned webkitAudioDecodedByteCount() const;
</span><span class="lines">@@ -830,7 +835,7 @@
</span><span class="cx"> bool m_havePreparedToPlay : 1;
</span><span class="cx"> bool m_parsingInProgress : 1;
</span><span class="cx"> #if ENABLE(PAGE_VISIBILITY_API)
</span><del>- bool m_isDisplaySleepDisablingSuspended : 1;
</del><ins>+ bool m_elementIsHidden : 1;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSession.cpp (167733 => 167734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSession.cpp 2014-04-24 00:43:15 UTC (rev 167733)
+++ trunk/Source/WebCore/platform/audio/MediaSession.cpp 2014-04-24 01:23:58 UTC (rev 167734)
</span><span class="lines">@@ -105,6 +105,7 @@
</span><span class="cx"> {
</span><span class="cx"> setState(Playing);
</span><span class="cx"> MediaSessionManager::sharedManager().sessionWillBeginPlayback(*this);
</span><ins>+ updateClientDataBuffering();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -121,6 +122,7 @@
</span><span class="cx">
</span><span class="cx"> setState(Paused);
</span><span class="cx"> MediaSessionManager::sharedManager().sessionWillEndPlayback(*this);
</span><ins>+ updateClientDataBuffering();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -159,7 +161,20 @@
</span><span class="cx"> {
</span><span class="cx"> m_client.didReceiveRemoteControlCommand(command);
</span><span class="cx"> }
</span><del>-
</del><ins>+
+#if ENABLE(PAGE_VISIBILITY_API)
+void MediaSession::visibilityChanged()
+{
+ updateClientDataBuffering();
+}
+
+void MediaSession::updateClientDataBuffering()
+{
+ bool shouldBuffer = m_state == Playing || !m_client.elementIsHidden();
+ m_client.setShouldBufferData(shouldBuffer);
+}
+#endif
+
</ins><span class="cx"> String MediaSessionClient::mediaSessionTitle() const
</span><span class="cx"> {
</span><span class="cx"> return String();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSession.h (167733 => 167734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSession.h 2014-04-24 00:43:15 UTC (rev 167733)
+++ trunk/Source/WebCore/platform/audio/MediaSession.h 2014-04-24 01:23:58 UTC (rev 167734)
</span><span class="lines">@@ -72,6 +72,10 @@
</span><span class="cx">
</span><span class="cx"> void pauseSession();
</span><span class="cx">
</span><ins>+#if ENABLE(PAGE_VISIBILITY_API)
+ void visibilityChanged();
+#endif
+
</ins><span class="cx"> String title() const;
</span><span class="cx"> double duration() const;
</span><span class="cx"> double currentTime() const;
</span><span class="lines">@@ -94,6 +98,10 @@
</span><span class="cx"> MediaSessionClient& client() const { return m_client; }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+#if ENABLE(PAGE_VISIBILITY_API)
+ void updateClientDataBuffering();
+#endif
+
</ins><span class="cx"> MediaSessionClient& m_client;
</span><span class="cx"> State m_state;
</span><span class="cx"> State m_stateToRestore;
</span><span class="lines">@@ -116,6 +124,9 @@
</span><span class="cx"> virtual bool canReceiveRemoteControlCommands() const = 0;
</span><span class="cx"> virtual void didReceiveRemoteControlCommand(MediaSession::RemoteControlCommandType) = 0;
</span><span class="cx">
</span><ins>+ virtual void setShouldBufferData(bool) { }
+ virtual bool elementIsHidden() const { return false; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> virtual ~MediaSessionClient() { }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (167733 => 167734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-04-24 00:43:15 UTC (rev 167733)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-04-24 01:23:58 UTC (rev 167734)
</span><span class="lines">@@ -513,6 +513,11 @@
</span><span class="cx"> m_private->pause();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayer::setShouldBufferData(bool shouldBuffer)
+{
+ m_private->setShouldBufferData(shouldBuffer);
+}
+
</ins><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA)
</span><span class="cx"> MediaPlayer::MediaKeyException MediaPlayer::generateKeyRequest(const String& keySystem, const unsigned char* initData, unsigned initDataLength)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (167733 => 167734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-04-24 00:43:15 UTC (rev 167733)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-04-24 01:23:58 UTC (rev 167734)
</span><span class="lines">@@ -338,6 +338,7 @@
</span><span class="cx"> void prepareToPlay();
</span><span class="cx"> void play();
</span><span class="cx"> void pause();
</span><ins>+ void setShouldBufferData(bool);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> // Represents synchronous exceptions that can be thrown from the Encrypted Media methods.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (167733 => 167734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-04-24 00:43:15 UTC (rev 167733)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-04-24 01:23:58 UTC (rev 167734)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void play() = 0;
</span><span class="cx"> virtual void pause() = 0;
</span><ins>+ virtual void setShouldBufferData(bool) { }
</ins><span class="cx">
</span><span class="cx"> virtual bool supportsFullscreen() const { return false; }
</span><span class="cx"> virtual bool supportsSave() const { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (167733 => 167734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-04-24 00:43:15 UTC (rev 167733)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-04-24 01:23:58 UTC (rev 167734)
</span><span class="lines">@@ -111,6 +111,8 @@
</span><span class="cx"> void rateDidChange(double);
</span><span class="cx"> void metadataDidArrive(RetainPtr<NSArray>, double);
</span><span class="cx">
</span><ins>+ virtual void setShouldBufferData(bool);
+
</ins><span class="cx"> #if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
</span><span class="cx"> void outputMediaDataWillChange(AVPlayerItemVideoOutput*);
</span><span class="cx"> #endif
</span><span class="lines">@@ -326,6 +328,7 @@
</span><span class="cx"> bool m_cachedBufferEmpty;
</span><span class="cx"> bool m_cachedBufferFull;
</span><span class="cx"> bool m_cachedHasEnabledAudio;
</span><ins>+ bool m_shouldBufferData;
</ins><span class="cx"> #if ENABLE(IOS_AIRPLAY)
</span><span class="cx"> mutable bool m_allowsWirelessVideoPlayback;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (167733 => 167734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-04-24 00:43:15 UTC (rev 167733)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-04-24 01:23:58 UTC (rev 167734)
</span><span class="lines">@@ -371,6 +371,7 @@
</span><span class="cx"> , m_cachedBufferEmpty(false)
</span><span class="cx"> , m_cachedBufferFull(false)
</span><span class="cx"> , m_cachedHasEnabledAudio(false)
</span><ins>+ , m_shouldBufferData(true)
</ins><span class="cx"> #if ENABLE(IOS_AIRPLAY)
</span><span class="cx"> , m_allowsWirelessVideoPlayback(true)
</span><span class="cx"> #endif
</span><span class="lines">@@ -2274,6 +2275,23 @@
</span><span class="cx"> updateStates();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateAVFoundationObjC::setShouldBufferData(bool shouldBuffer)
+{
+ LOG(Media, "MediaPlayerPrivateAVFoundationObjC::shouldBufferData(%p) - %s", this, boolString(shouldBuffer));
+ if (m_shouldBufferData == shouldBuffer)
+ return;
+
+ m_shouldBufferData = shouldBuffer;
+
+ if (!m_avPlayer)
+ return;
+
+ if (m_shouldBufferData)
+ [m_avPlayer.get() replaceCurrentItemWithPlayerItem:m_avPlayerItem.get()];
+ else
+ [m_avPlayer.get() replaceCurrentItemWithPlayerItem:nil];
+}
+
</ins><span class="cx"> #if ENABLE(DATACUE_VALUE)
</span><span class="cx"> static const AtomicString& metadataType(NSString *avMetadataKeySpace)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>