Changeset 162870 in webkit

Timestamp:

Jan 27, 2014, 2:47:27 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

[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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (2 diffs)
• platform/audio/ios/MediaSessionManagerIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
 2014-01-27  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -4109 +4109 @@
 bool HTMLMediaElement::potentiallyPlaying() const
 {
-    // When media engine ran out of buffered data it's not playing.
-    if (m_readyStateMaximum < HAVE_FUTURE_DATA && m_readyState < HAVE_FUTURE_DATA)
+    if (isBlockedOnMediaController())
         return false;
-
-    return couldPlayIfEnoughData() && !isBlockedOnMediaController();
+    
+    if (!couldPlayIfEnoughData())
+        return false;
+
+    if (m_readyState >= HAVE_FUTURE_DATA)
+        return true;
+
+    return m_readyStateMaximum >= HAVE_FUTURE_DATA && m_readyState < HAVE_FUTURE_DATA;
 }
 
@@ -4243 +4248 @@
     bool playerPaused = m_player->paused();
 
-#if PLATFORM(IOS)
-    if (shouldBePlaying && !m_requestingPlay && !m_player->readyForPlayback())
-        shouldBePlaying = false;
-    else if (!shouldBePlaying && m_requestingPlay && m_player->readyForPlayback())
-        shouldBePlaying = true;
+#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;
+    }
 #endif
 

trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm

@@ -74 +74 @@
     , m_objcObserver(adoptNS([[WebMediaSessionHelper alloc] initWithCallback:this]))
 {
+    resetRestrictions();
 }