Changeset 202333 in webkit

Timestamp:

Jun 22, 2016 10:16:27 AM (8 years ago)

Author:

jer.noble@apple.com

Message:

Media controls stop working after exiting PiP
​https://bugs.webkit.org/show_bug.cgi?id=159026
<rdar://problem/26753579>

Reviewed by Eric Carlson.

Do not slave setting WebVideoFullscreenModelVideoElement::setVideoElement() to
WebPlaybackSessionModelVideoElement::setMediaElement(). After all, someone else
(i.e., the media controls) may still be using it.

• platform/cocoa/WebVideoFullscreenModelVideoElement.mm:

(WebVideoFullscreenModelVideoElement::setVideoElement): Deleted.

• platform/ios/WebVideoFullscreenControllerAVKit.mm:

(WebVideoFullscreenControllerContext::didCleanupFullscreen):
(WebVideoFullscreenControllerContext::setUpFullscreen):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/cocoa/WebVideoFullscreenModelVideoElement.mm (modified) (1 diff)
• platform/ios/WebVideoFullscreenControllerAVKit.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-22  Jer Noble  <jer.noble@apple.com>
+
+        Media controls stop working after exiting PiP
+        https://bugs.webkit.org/show_bug.cgi?id=159026
+        <rdar://problem/26753579>
+
+        Reviewed by Eric Carlson.
+
+        Do not slave setting WebVideoFullscreenModelVideoElement::setVideoElement() to
+        WebPlaybackSessionModelVideoElement::setMediaElement(). After all, someone else
+        (i.e., the media controls) may still be using it.
+
+        * platform/cocoa/WebVideoFullscreenModelVideoElement.mm:
+        (WebVideoFullscreenModelVideoElement::setVideoElement): Deleted.
+        * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+        (WebVideoFullscreenControllerContext::didCleanupFullscreen):
+        (WebVideoFullscreenControllerContext::setUpFullscreen):
+
 2016-06-22  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm

@@ -89 +89 @@
 
     m_videoElement = videoElement;
-    m_playbackSessionModel->setMediaElement(videoElement);
 
     if (!m_videoElement)

trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm

@@ -287 +287 @@
         m_model->setWebVideoFullscreenInterface(nullptr);
         m_model->setVideoElement(nullptr);
+        m_model->playbackSessionModel().setMediaElement(nullptr);
         m_model = nullptr;
         m_videoElement = nullptr;
@@ -662 +663 @@
             m_model->setWebVideoFullscreenInterface(this);
             m_model->setVideoElement(m_videoElement.get());
+            m_model->playbackSessionModel().setMediaElement(m_videoElement.get());
 
             IntRect videoElementClientRect = elementRectInWindow(m_videoElement.get());