Changeset 201435 in webkit

Timestamp:

May 26, 2016, 3:05:26 PM (9 years ago)

Author:

adachan@apple.com

Message:

Add WebKitAdditions extension point in HTMLMediaElement.
​https://bugs.webkit.org/show_bug.cgi?id=158097

Reviewed by Eric Carlson.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::shouldOverrideBackgroundLoadingRestriction):
We need to load data in the background if playing to wireless playback target.
(WebCore::HTMLMediaElement::fullscreenModeChanged):
Moved from header file.

• html/HTMLMediaElement.h:

• platform/audio/PlatformMediaSession.cpp:

(WebCore::PlatformMediaSession::clientWillPausePlayback):
The code to start m_clientDataBufferingTimer is also in visibilityChanged().
Moved that code to PlatformMediaSession::scheduleClientDataBufferingCheck() and call
that method here.
(WebCore::PlatformMediaSession::visibilityChanged):
Call PlatformMediaSession::scheduleClientDataBufferingCheck().
(WebCore::PlatformMediaSession::scheduleClientDataBufferingCheck):
Start m_clientDataBufferingTimer if it's not already active.
(WebCore::PlatformMediaSession::shouldOverrideBackgroundLoadingRestriction):
Call the client.

• platform/audio/PlatformMediaSession.h:

(WebCore::PlatformMediaSessionClient::shouldOverrideBackgroundLoadingRestriction):

• platform/audio/PlatformMediaSessionManager.cpp:

(WebCore::PlatformMediaSessionManager::sessionCanLoadMedia):
Call the new PlatformMediaSession::shouldOverrideBackgroundLoadingRestriction().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (2 diffs)
• html/HTMLMediaElement.h (modified) (2 diffs)
• platform/audio/PlatformMediaSession.cpp (modified) (3 diffs)
• platform/audio/PlatformMediaSession.h (modified) (3 diffs)
• platform/audio/PlatformMediaSessionManager.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-25  Ada Chan  <adachan@apple.com>
+
+        Add WebKitAdditions extension point in HTMLMediaElement.
+        https://bugs.webkit.org/show_bug.cgi?id=158097
+
+        Reviewed by Eric Carlson.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::shouldOverrideBackgroundLoadingRestriction):
+        We need to load data in the background if playing to wireless playback target.
+        (WebCore::HTMLMediaElement::fullscreenModeChanged):
+        Moved from header file.
+        * html/HTMLMediaElement.h:
+
+        * platform/audio/PlatformMediaSession.cpp:
+        (WebCore::PlatformMediaSession::clientWillPausePlayback):
+        The code to start m_clientDataBufferingTimer is also in visibilityChanged().
+        Moved that code to PlatformMediaSession::scheduleClientDataBufferingCheck() and call
+        that method here.
+        (WebCore::PlatformMediaSession::visibilityChanged):
+        Call PlatformMediaSession::scheduleClientDataBufferingCheck().
+        (WebCore::PlatformMediaSession::scheduleClientDataBufferingCheck):
+        Start m_clientDataBufferingTimer if it's not already active.
+        (WebCore::PlatformMediaSession::shouldOverrideBackgroundLoadingRestriction):
+        Call the client.
+
+        * platform/audio/PlatformMediaSession.h:
+        (WebCore::PlatformMediaSessionClient::shouldOverrideBackgroundLoadingRestriction):
+
+        * platform/audio/PlatformMediaSessionManager.cpp:
+        (WebCore::PlatformMediaSessionManager::sessionCanLoadMedia):
+        Call the new PlatformMediaSession::shouldOverrideBackgroundLoadingRestriction().
+
 2016-05-26  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -153 +153 @@
 #endif
 
+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/HTMLMediaElementAdditions.cpp>
+#endif
+
 namespace WebCore {
 
@@ -7025 +7029 @@
 }
 
-}
-
-#endif
+#if !USE(APPLE_INTERNAL_SDK)
+bool HTMLMediaElement::shouldOverrideBackgroundLoadingRestriction() const
+{
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+    if (isPlayingToWirelessPlaybackTarget())
+        return true;
+#endif
+
+    return false;
+}
+
+void HTMLMediaElement::fullscreenModeChanged(VideoFullscreenMode mode)
+{
+    m_videoFullscreenMode = mode;
+}
+#endif
+
+}
+
+#endif

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -371 +371 @@
     using MediaPlayerEnums::VideoFullscreenMode;
     VideoFullscreenMode fullscreenMode() const { return m_videoFullscreenMode; }
-    virtual void fullscreenModeChanged(VideoFullscreenMode mode) { m_videoFullscreenMode = mode; }
+    virtual void fullscreenModeChanged(VideoFullscreenMode);
 
     void enterFullscreen(VideoFullscreenMode);
@@ -758 +758 @@
     void didReceiveRemoteControlCommand(PlatformMediaSession::RemoteControlCommandType) override;
     bool shouldOverrideBackgroundPlaybackRestriction(PlatformMediaSession::InterruptionType) const override;
+    bool shouldOverrideBackgroundLoadingRestriction() const override;
 
     void pageMutedStateDidChange() override;

trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp

@@ -187 +187 @@
     setState(Paused);
     PlatformMediaSessionManager::sharedManager().sessionWillEndPlayback(*this);
-    if (!m_clientDataBufferingTimer.isActive())
-        m_clientDataBufferingTimer.startOneShot(kClientDataBufferingTimerThrottleDelay);
+    scheduleClientDataBufferingCheck();
     return true;
 }
@@ -249 +248 @@
 void PlatformMediaSession::visibilityChanged()
 {
+    scheduleClientDataBufferingCheck();
+}
+
+void PlatformMediaSession::scheduleClientDataBufferingCheck()
+{
     if (!m_clientDataBufferingTimer.isActive())
         m_clientDataBufferingTimer.startOneShot(kClientDataBufferingTimerThrottleDelay);
@@ -282 +286 @@
 {
     return m_client.elementIsHidden();
+}
+
+bool PlatformMediaSession::shouldOverrideBackgroundLoadingRestriction() const
+{
+    return m_client.shouldOverrideBackgroundLoadingRestriction();
 }
 

trunk/Source/WebCore/platform/audio/PlatformMediaSession.h

@@ -138 +138 @@
     bool isHidden() const;
 
+    bool shouldOverrideBackgroundLoadingRestriction() const;
+
     virtual bool canPlayToWirelessPlaybackTarget() const { return false; }
     virtual bool isPlayingToWirelessPlaybackTarget() const { return m_isPlayingToWirelessPlaybackTarget; }
@@ -156 +158 @@
     bool canProduceAudio() const { return m_canProduceAudio; }
     void setCanProduceAudio(bool);
+
+    void scheduleClientDataBufferingCheck();
 
 protected:
@@ -204 +208 @@
 
     virtual bool shouldOverrideBackgroundPlaybackRestriction(PlatformMediaSession::InterruptionType) const = 0;
+    virtual bool shouldOverrideBackgroundLoadingRestriction() const { return false; }
 
     virtual void wirelessRoutesAvailableDidChange() { }

trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp

@@ -281 +281 @@
 bool PlatformMediaSessionManager::sessionCanLoadMedia(const PlatformMediaSession& session) const
 {
-    return session.state() == PlatformMediaSession::Playing || !session.isHidden() || session.isPlayingToWirelessPlaybackTarget();
+    return session.state() == PlatformMediaSession::Playing || !session.isHidden() || session.shouldOverrideBackgroundLoadingRestriction();
 }