Title: [234301] branches/safari-606-branch/Source/WebCore
- Revision
- 234301
- Author
- [email protected]
- Date
- 2018-07-26 23:02:10 -0700 (Thu, 26 Jul 2018)
Log Message
Cherry-pick r234078. rdar://problem/42490088
REGRESSION (r233974): Cannot close pip'd video; pops back into PiP.
https://bugs.webkit.org/show_bug.cgi?id=187873
Reviewed by Jon Lee.
When the PIP machinery on Mac wants to close the PIP window (due to the close button being clicked), it does
not consult our -shouldClosePiP handler; it just tells us that we're going to close. So we never setup the
necessary state on the WebProcess side and still think that our "targetIsFullscreen". When we get the "stop"
action, just request exit fullscreen, but set up the _pipState to think we're already exiting (because we are).
* platform/mac/VideoFullscreenInterfaceMac.mm:
(-[WebVideoFullscreenInterfaceMacObjC pipActionStop:]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234078 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/WebCore/ChangeLog (234300 => 234301)
--- branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-27 06:02:07 UTC (rev 234300)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-27 06:02:10 UTC (rev 234301)
@@ -1,5 +1,40 @@
2018-07-26 Babak Shafiei <[email protected]>
+ Cherry-pick r234078. rdar://problem/42490088
+
+ REGRESSION (r233974): Cannot close pip'd video; pops back into PiP.
+ https://bugs.webkit.org/show_bug.cgi?id=187873
+
+ Reviewed by Jon Lee.
+
+ When the PIP machinery on Mac wants to close the PIP window (due to the close button being clicked), it does
+ not consult our -shouldClosePiP handler; it just tells us that we're going to close. So we never setup the
+ necessary state on the WebProcess side and still think that our "targetIsFullscreen". When we get the "stop"
+ action, just request exit fullscreen, but set up the _pipState to think we're already exiting (because we are).
+
+ * platform/mac/VideoFullscreenInterfaceMac.mm:
+ (-[WebVideoFullscreenInterfaceMacObjC pipActionStop:]):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234078 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-20 Jer Noble <[email protected]>
+
+ REGRESSION (r233974): Cannot close pip'd video; pops back into PiP.
+ https://bugs.webkit.org/show_bug.cgi?id=187873
+
+ Reviewed by Jon Lee.
+
+ When the PIP machinery on Mac wants to close the PIP window (due to the close button being clicked), it does
+ not consult our -shouldClosePiP handler; it just tells us that we're going to close. So we never setup the
+ necessary state on the WebProcess side and still think that our "targetIsFullscreen". When we get the "stop"
+ action, just request exit fullscreen, but set up the _pipState to think we're already exiting (because we are).
+
+ * platform/mac/VideoFullscreenInterfaceMac.mm:
+ (-[WebVideoFullscreenInterfaceMacObjC pipActionStop:]):
+
+2018-07-26 Babak Shafiei <[email protected]>
+
Cherry-pick r234051. rdar://problem/42451584
First Auto-PiP from Fullscreen too small & animation blocks
Modified: branches/safari-606-branch/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm (234300 => 234301)
--- branches/safari-606-branch/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm 2018-07-27 06:02:07 UTC (rev 234300)
+++ branches/safari-606-branch/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm 2018-07-27 06:02:10 UTC (rev 234301)
@@ -335,8 +335,8 @@
if (PlaybackSessionModel* playbackSessionModel = _videoFullscreenInterfaceMac->playbackSessionModel())
playbackSessionModel->pause();
- // FIXME 25096170: Should animate only if the page with the video is unobscured. For now, always close without animation.
- [self exitPIP];
+ _videoFullscreenInterfaceMac->requestHideAndExitFullscreen();
+ _pipState = PIPState::ExitingPIP;
}
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
