<!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>[162870] 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/162870">162870</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-01-27 14:47:27 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] preload=none prevents play()
https://bugs.webkit.org/show_bug.cgi?id=127702
Reviewed by Jer Noble.
No new tests, covered by existing tests.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::potentiallyPlaying): Cleanup logic to make it simpler to understand,
fix logic error introduced in <a href="http://trac.webkit.org/projects/webkit/changeset/161973">r161973</a>
(WebCore::HTMLMediaElement::updatePlayState): Conditionalize some iOS-only code on whether or not
we are using the plug-in proxy.</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="#trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm">trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162869 => 162870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-27 22:38:41 UTC (rev 162869)
+++ trunk/Source/WebCore/ChangeLog 2014-01-27 22:47:27 UTC (rev 162870)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-27 Eric Carlson <eric.carlson@apple.com>
+
+ [iOS] preload=none prevents play()
+ https://bugs.webkit.org/show_bug.cgi?id=127702
+
+ Reviewed by Jer Noble.
+
+ No new tests, covered by existing tests.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::potentiallyPlaying): Cleanup logic to make it simpler to understand,
+ fix logic error introduced in r161973
+ (WebCore::HTMLMediaElement::updatePlayState): Conditionalize some iOS-only code on whether or not
+ we are using the plug-in proxy.
+
</ins><span class="cx"> 2014-01-27 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IDB: LevelDB backing store shouldn't know about IDBCursor or IDBCallbacks
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (162869 => 162870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-01-27 22:38:41 UTC (rev 162869)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-01-27 22:47:27 UTC (rev 162870)
</span><span class="lines">@@ -4108,11 +4108,16 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::potentiallyPlaying() const
</span><span class="cx"> {
</span><del>- // When media engine ran out of buffered data it's not playing.
- if (m_readyStateMaximum < HAVE_FUTURE_DATA && m_readyState < HAVE_FUTURE_DATA)
</del><ins>+ if (isBlockedOnMediaController())
</ins><span class="cx"> return false;
</span><ins>+
+ if (!couldPlayIfEnoughData())
+ return false;
</ins><span class="cx">
</span><del>- return couldPlayIfEnoughData() && !isBlockedOnMediaController();
</del><ins>+ if (m_readyState >= HAVE_FUTURE_DATA)
+ return true;
+
+ return m_readyStateMaximum >= HAVE_FUTURE_DATA && m_readyState < HAVE_FUTURE_DATA;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::couldPlayIfEnoughData() const
</span><span class="lines">@@ -4242,11 +4247,13 @@
</span><span class="cx"> bool shouldBePlaying = potentiallyPlaying();
</span><span class="cx"> bool playerPaused = m_player->paused();
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- if (shouldBePlaying && !m_requestingPlay && !m_player->readyForPlayback())
- shouldBePlaying = false;
- else if (!shouldBePlaying && m_requestingPlay && m_player->readyForPlayback())
- shouldBePlaying = true;
</del><ins>+#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
+ if (shouldUseVideoPluginProxy()) {
+ if (shouldBePlaying && !m_requestingPlay && !m_player->readyForPlayback())
+ shouldBePlaying = false;
+ else if (!shouldBePlaying && m_requestingPlay && m_player->readyForPlayback())
+ shouldBePlaying = true;
+ }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> LOG(Media, "HTMLMediaElement::updatePlayState - shouldBePlaying = %s, playerPaused = %s",
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (162869 => 162870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-01-27 22:38:41 UTC (rev 162869)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-01-27 22:47:27 UTC (rev 162870)
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> :MediaSessionManager()
</span><span class="cx"> , m_objcObserver(adoptNS([[WebMediaSessionHelper alloc] initWithCallback:this]))
</span><span class="cx"> {
</span><ins>+ resetRestrictions();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaSessionManageriOS::resetRestrictions()
</span></span></pre>
</div>
</div>
</body>
</html>