Title: [234386] branches/safari-606-branch/Source/WebCore
- Revision
- 234386
- Author
- [email protected]
- Date
- 2018-07-30 15:01:30 -0700 (Mon, 30 Jul 2018)
Log Message
Revert r234264. rdar://problem/42650373
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/WebCore/ChangeLog (234385 => 234386)
--- branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-30 22:01:26 UTC (rev 234385)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-30 22:01:30 UTC (rev 234386)
@@ -1,5 +1,9 @@
2018-07-30 Babak Shafiei <[email protected]>
+ Revert r234264. rdar://problem/42650373
+
+2018-07-30 Babak Shafiei <[email protected]>
+
Revert r234298. rdar://problem/42354941
2018-07-30 Babak Shafiei <[email protected]>
Modified: branches/safari-606-branch/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.h (234385 => 234386)
--- branches/safari-606-branch/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.h 2018-07-30 22:01:26 UTC (rev 234385)
+++ branches/safari-606-branch/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.h 2018-07-30 22:01:30 UTC (rev 234386)
@@ -77,7 +77,7 @@
WEBCORE_EXPORT void exitFullscreenWithoutAnimationToMode(HTMLMediaElementEnums::VideoFullscreenMode);
WEBCORE_EXPORT void cleanupFullscreen();
WEBCORE_EXPORT void invalidate();
- void requestHideAndExitFullscreen() { }
+ WEBCORE_EXPORT void requestHideAndExitFullscreen();
WEBCORE_EXPORT void preparedToReturnToInline(bool visible, const IntRect& inlineRect, NSWindow *parentWindow);
void preparedToExitFullscreen() { }
@@ -94,8 +94,6 @@
WEBCORE_EXPORT WebVideoFullscreenInterfaceMacObjC *videoFullscreenInterfaceObjC();
- WEBCORE_EXPORT void requestHideAndExitPiP();
-
private:
WEBCORE_EXPORT VideoFullscreenInterfaceMac(PlaybackSessionInterfaceMac&);
Ref<PlaybackSessionInterfaceMac> m_playbackSessionInterface;
Modified: branches/safari-606-branch/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm (234385 => 234386)
--- branches/safari-606-branch/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm 2018-07-30 22:01:26 UTC (rev 234385)
+++ branches/safari-606-branch/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm 2018-07-30 22:01:30 UTC (rev 234386)
@@ -274,7 +274,7 @@
if (!_videoFullscreenInterfaceMac || !_videoFullscreenInterfaceMac->videoFullscreenChangeObserver())
return YES;
- _videoFullscreenInterfaceMac->requestHideAndExitPiP();
+ _videoFullscreenInterfaceMac->requestHideAndExitFullscreen();
return NO;
}
@@ -333,7 +333,7 @@
if (PlaybackSessionModel* playbackSessionModel = _videoFullscreenInterfaceMac->playbackSessionModel())
playbackSessionModel->pause();
- _videoFullscreenInterfaceMac->requestHideAndExitPiP();
+ _videoFullscreenInterfaceMac->requestHideAndExitFullscreen();
_pipState = PIPState::ExitingPIP;
}
@@ -506,7 +506,7 @@
m_webVideoFullscreenInterfaceObjC = nil;
}
-void VideoFullscreenInterfaceMac::requestHideAndExitPiP()
+void VideoFullscreenInterfaceMac::requestHideAndExitFullscreen()
{
if (!m_videoFullscreenModel)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
