Title: [202333] trunk/Source/WebCore
- Revision
- 202333
- Author
- [email protected]
- Date
- 2016-06-22 10:16:27 -0700 (Wed, 22 Jun 2016)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (202332 => 202333)
--- trunk/Source/WebCore/ChangeLog 2016-06-22 17:14:02 UTC (rev 202332)
+++ trunk/Source/WebCore/ChangeLog 2016-06-22 17:16:27 UTC (rev 202333)
@@ -1,5 +1,23 @@
2016-06-22 Jer Noble <[email protected]>
+ 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 <[email protected]>
+
Update document's isPlayingMedia() state whenever media element's media state changes
https://bugs.webkit.org/show_bug.cgi?id=159018
<rdar://problem/26586630>
Modified: trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm (202332 => 202333)
--- trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm 2016-06-22 17:14:02 UTC (rev 202332)
+++ trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm 2016-06-22 17:16:27 UTC (rev 202333)
@@ -88,7 +88,6 @@
m_isListening = false;
m_videoElement = videoElement;
- m_playbackSessionModel->setMediaElement(videoElement);
if (!m_videoElement)
return;
Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (202332 => 202333)
--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2016-06-22 17:14:02 UTC (rev 202332)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2016-06-22 17:16:27 UTC (rev 202333)
@@ -286,6 +286,7 @@
m_model->setVideoFullscreenLayer(nil);
m_model->setWebVideoFullscreenInterface(nullptr);
m_model->setVideoElement(nullptr);
+ m_model->playbackSessionModel().setMediaElement(nullptr);
m_model = nullptr;
m_videoElement = nullptr;
@@ -661,6 +662,7 @@
m_model = WebVideoFullscreenModelVideoElement::create(WebPlaybackSessionModelMediaElement::create().get());
m_model->setWebVideoFullscreenInterface(this);
m_model->setVideoElement(m_videoElement.get());
+ m_model->playbackSessionModel().setMediaElement(m_videoElement.get());
IntRect videoElementClientRect = elementRectInWindow(m_videoElement.get());
FloatRect videoLayerFrame = FloatRect(FloatPoint(), videoElementClientRect.size());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
