Title: [181739] tags/Safari-601.1.23.3/Source/WebCore
Revision
181739
Author
[email protected]
Date
2015-03-19 01:53:24 -0700 (Thu, 19 Mar 2015)

Log Message

Merged r181666.  rdar://problem/19445803

Modified Paths

Diff

Modified: tags/Safari-601.1.23.3/Source/WebCore/ChangeLog (181738 => 181739)


--- tags/Safari-601.1.23.3/Source/WebCore/ChangeLog	2015-03-19 08:51:42 UTC (rev 181738)
+++ tags/Safari-601.1.23.3/Source/WebCore/ChangeLog	2015-03-19 08:53:24 UTC (rev 181739)
@@ -1,5 +1,22 @@
 2015-03-19  Babak Shafiei  <[email protected]>
 
+        Merge r181666.
+
+    2015-03-17  Jeremy Jones  <[email protected]>
+
+            When tab hides, pause fullscreen and exit normally.
+            https://bugs.webkit.org/show_bug.cgi?id=142685
+
+            Reviewed by Eric Carlson.
+
+            Pause fullscreen playback when switching tabs. Exit fullscreen is not necessary and even prevents
+            the normal flow of teardown. This allows the normal exit fullscreen call to succeed and call its callback.
+
+            * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+            (WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen):
+
+2015-03-19  Babak Shafiei  <[email protected]>
+
         Merge r181616.
 
     2015-03-16  Jon Lee  <[email protected]>

Modified: tags/Safari-601.1.23.3/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (181738 => 181739)


--- tags/Safari-601.1.23.3/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2015-03-19 08:51:42 UTC (rev 181738)
+++ tags/Safari-601.1.23.3/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2015-03-19 08:53:24 UTC (rev 181739)
@@ -1154,12 +1154,12 @@
     RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
     dispatch_async(dispatch_get_main_queue(), [strongThis] {
         [strongThis->m_window setHidden:YES];
-        [strongThis->m_playerViewController exitFullScreenAnimated:NO completionHandler:[strongThis] (BOOL, NSError*) {
-        }];
     });
 
-    if (m_videoFullscreenModel && !m_exitRequested)
+    if (m_videoFullscreenModel && !m_exitRequested) {
+        m_videoFullscreenModel->pause();
         m_videoFullscreenModel->requestExitFullscreen();
+    }
 }
 
 void WebVideoFullscreenInterfaceAVKit::preparedToReturnToInline(bool visible, const IntRect& inlineRect)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to