Changeset 93878 in webkit

Timestamp:

Aug 26, 2011, 8:14:03 AM (15 years ago)

Author:

eric.carlson@apple.com

Message:

<video> playlist can not advance when playing in background tab
​https://bugs.webkit.org/show_bug.cgi?id=66978

Reviewed by Darin Adler.

No new tests added because it isn't possible to simulate a background tab in DRT.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::HTMLMediaElement): Set RequirePageConsentToLoadMedia restriction.
(WebCore::HTMLMediaElement::loadInternal): Don't consider page->canStartMedia if it has ever

allowed a file to load.

• html/HTMLMediaElement.h:

(WebCore::HTMLMediaElement::requirePageConsentToLoadMedia): New.
(WebCore::HTMLMediaElement::removeBehaviorRestriction): New.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (3 diffs)
• html/HTMLMediaElement.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-26  Eric Carlson  <eric.carlson@apple.com>
+
+        <video> playlist can not advance when playing in background tab
+        https://bugs.webkit.org/show_bug.cgi?id=66978
+
+        Reviewed by Darin Adler.
+
+        No new tests added because it isn't possible to simulate a background tab in DRT.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::HTMLMediaElement): Set RequirePageConsentToLoadMedia restriction.
+        (WebCore::HTMLMediaElement::loadInternal): Don't consider page->canStartMedia if it has ever
+            allowed a file to load.
+        * html/HTMLMediaElement.h:
+        (WebCore::HTMLMediaElement::requirePageConsentToLoadMedia): New.
+        (WebCore::HTMLMediaElement::removeBehaviorRestriction): New.
+
 2011-08-26  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -151 +151 @@
     , m_proxyWidget(0)
 #endif
-    , m_restrictions(RequireUserGestureForFullScreenRestriction)
+    , m_restrictions(RequireUserGestureForFullScreenRestriction | RequirePageConsentToLoadMedia)
     , m_preload(MediaPlayer::Auto)
     , m_displayMode(Unknown)
@@ -585 +585 @@
     // If we can't start a load right away, start it later.
     Page* page = document()->page();
-    if (page && !page->canStartMedia()) {
+    if (requirePageConsentToLoadMedia() && page && !page->canStartMedia()) {
         if (m_isWaitingUntilMediaCanStart)
             return;
@@ -592 +592 @@
         return;
     }
+    
+    // Once the page has allowed an element to load media, it is free to load at will. This allows a 
+    // playlist that starts in a foreground tab to continue automatically if the tab is subsequently 
+    // put in the the background.
+    removeBehaviorRestriction(RequirePageConsentToLoadMedia);
 
     selectMediaResource();

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -185 +185 @@
         RequireUserGestureForLoadRestriction = 1 << 0,
         RequireUserGestureForRateChangeRestriction = 1 << 1,
-        RequireUserGestureForFullScreenRestriction = 1 << 2
+        RequireUserGestureForFullScreenRestriction = 1 << 2,
+        RequirePageConsentToLoadMedia = 1 << 3,
     };
     typedef unsigned BehaviorRestrictions;
@@ -192 +193 @@
     bool requireUserGestureForRateChange() const { return m_restrictions & RequireUserGestureForRateChangeRestriction; }
     bool requireUserGestureForFullScreen() const { return m_restrictions & RequireUserGestureForFullScreenRestriction; }
+    bool requirePageConsentToLoadMedia() const { return m_restrictions & RequirePageConsentToLoadMedia; }
 
     void setBehaviorRestrictions(BehaviorRestrictions restrictions) { m_restrictions = restrictions; }
@@ -333 +335 @@
     virtual void mediaCanStart();
 
+    void removeBehaviorRestriction(BehaviorRestrictions restriction) { m_restrictions &= ~restriction; }
+
     void setShouldDelayLoadEvent(bool);