Changeset 242363 in webkit

Timestamp:

Mar 4, 2019 9:28:39 AM (5 years ago)

Author:

bshafiei@apple.com

Message:

Cherry-pick r242355. rdar://problem/48563894

[iOS] Fullscreen "stay in page" option breaks video playback
​https://bugs.webkit.org/show_bug.cgi?id=195277
<rdar://problem/48537317>

Reviewed by Eric Carlson.

Source/WebCore:

Add a LOG entry when playback is rejected due to media playback suspension.

• html/MediaElementSession.cpp: (WebCore::MediaElementSession::playbackPermitted const):

Source/WebKit:

Make sure we resume media playback when the user chooses "stay in page" from the deceptive
website warning dialog.

• UIProcess/ios/fullscreen/WKFullScreenViewController.mm: (-[WKFullScreenViewController _showPhishingAlert]):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@242355 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-607-branch/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/MediaElementSession.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm (modified) (1 diff)

branches/safari-607-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-04  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r242355. rdar://problem/48563894
+
+    [iOS] Fullscreen "stay in page" option breaks video playback
+    https://bugs.webkit.org/show_bug.cgi?id=195277
+    <rdar://problem/48537317>
+    
+    Reviewed by Eric Carlson.
+    
+    Source/WebCore:
+    
+    Add a LOG entry when playback is rejected due to media playback suspension.
+    
+    * html/MediaElementSession.cpp:
+    (WebCore::MediaElementSession::playbackPermitted const):
+    
+    Source/WebKit:
+    
+    Make sure we resume media playback when the user chooses "stay in page" from the deceptive
+    website warning dialog.
+    
+    * UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
+    (-[WKFullScreenViewController _showPhishingAlert]):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242355 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-04  Jer Noble  <jer.noble@apple.com>
+
+            [iOS] Fullscreen "stay in page" option breaks video playback
+            https://bugs.webkit.org/show_bug.cgi?id=195277
+            <rdar://problem/48537317>
+
+            Reviewed by Eric Carlson.
+
+            Add a LOG entry when playback is rejected due to media playback suspension.
+
+            * html/MediaElementSession.cpp:
+            (WebCore::MediaElementSession::playbackPermitted const):
+
 2019-03-01  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-607-branch/Source/WebCore/html/MediaElementSession.cpp

@@ -265 +265 @@
     auto& document = m_element.document();
     auto* page = document.page();
-    if (!page || page->mediaPlaybackIsSuspended())
+    if (!page || page->mediaPlaybackIsSuspended()) {
+        ALWAYS_LOG(LOGIDENTIFIER, "Returning FALSE because media playback is suspended");
         return MediaPlaybackDenialReason::PageConsentRequired;
+    }
 
     if (document.isMediaDocument() && !document.ownerElement())

branches/safari-607-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-04  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r242355. rdar://problem/48563894
+
+    [iOS] Fullscreen "stay in page" option breaks video playback
+    https://bugs.webkit.org/show_bug.cgi?id=195277
+    <rdar://problem/48537317>
+    
+    Reviewed by Eric Carlson.
+    
+    Source/WebCore:
+    
+    Add a LOG entry when playback is rejected due to media playback suspension.
+    
+    * html/MediaElementSession.cpp:
+    (WebCore::MediaElementSession::playbackPermitted const):
+    
+    Source/WebKit:
+    
+    Make sure we resume media playback when the user chooses "stay in page" from the deceptive
+    website warning dialog.
+    
+    * UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
+    (-[WKFullScreenViewController _showPhishingAlert]):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242355 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-04  Jer Noble  <jer.noble@apple.com>
+
+            [iOS] Fullscreen "stay in page" option breaks video playback
+            https://bugs.webkit.org/show_bug.cgi?id=195277
+            <rdar://problem/48537317>
+
+            Reviewed by Eric Carlson.
+
+            Make sure we resume media playback when the user chooses "stay in page" from the deceptive
+            website warning dialog.
+
+            * UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
+            (-[WKFullScreenViewController _showPhishingAlert]):
+
 2019-02-28  Andy Estes  <aestes@apple.com>
 

branches/safari-607-branch/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm

@@ -571 +571 @@
 
     UIAlertAction* stayAction = [UIAlertAction actionWithTitle:WEB_UI_STRING_KEY("Stay in Full Screen", "Stay in Full Screen (Element Full Screen)", "Full Screen Deceptive Website Stay Action") style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
-        if (auto* page = [self._webView _page])
+        if (auto* page = [self._webView _page]) {
             page->resumeActiveDOMObjectsAndAnimations();
+            page->resumeAllMediaPlayback();
+        }
         _secheuristic.reset();
     }];