Attachment 348190 Details for Bug 188749 – Patch for landing.

[patch] Patch for landing.

bug-188749-20180827125953.patch (text/plain), 9.64 KB, created by Jeremy Jones on 2018-08-27 12:59:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Jones

Created: 2018-08-27 12:59:53 PDT

Size: 9.64 KB

patch

obsolete

>Subversion Revision: 235391
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 871fe59580660e3d0e38cd70f3cfcc32bea056e3..6408f3853da045c80b58a9b12787f7e32dee25cd 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,23 @@
>+2018-08-20  Jeremy Jones  <jeremyj@apple.com>
>+
>+        UIWebView crash when enter/exit fullscreen happens too quickly.
>+        https://bugs.webkit.org/show_bug.cgi?id=188749
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: media/ios/media-fullscreen-return-to-inline.html
>+
>+        Null check m_interface when it is accessed after a dispatch.
>+
>+        * platform/ios/WebVideoFullscreenControllerAVKit.mm:
>+        (VideoFullscreenControllerContext::requestUpdateInlineRect):
>+        (VideoFullscreenControllerContext::requestVideoContentLayer):
>+        (VideoFullscreenControllerContext::returnVideoContentLayer):
>+        (VideoFullscreenControllerContext::didSetupFullscreen):
>+        (VideoFullscreenControllerContext::didExitFullscreen):
>+        (VideoFullscreenControllerContext::fullscreenMayReturnToInline):
>+        (VideoFullscreenControllerContext::exitFullscreen):
>+
> 2018-08-27  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: provide autocompletion for event breakpoints
>diff --git a/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm b/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
>index 7ff0cf574d6fd4bf57eb52cfc92c0f44e9c204c7..93feae38479d4a0703502554447e5183a424e0e6 100644
>--- a/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
>+++ b/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
>@@ -227,7 +227,8 @@ void VideoFullscreenControllerContext::requestUpdateInlineRect()
>     WebThreadRun([protectedThis = makeRefPtr(this), this] () mutable {
>         IntRect clientRect = elementRectInWindow(m_videoElement.get());
>         dispatch_async(dispatch_get_main_queue(), [protectedThis = WTFMove(protectedThis), this, clientRect] {
>-            m_interface->setInlineRect(clientRect, clientRect != IntRect(0, 0, 0, 0));
>+            if (m_interface)
>+                m_interface->setInlineRect(clientRect, clientRect != IntRect(0, 0, 0, 0));
>         });
>     });
> #else
>@@ -243,7 +244,8 @@ void VideoFullscreenControllerContext::requestVideoContentLayer()
>         [videoFullscreenLayer setBackgroundColor:cachedCGColor(WebCore::Color::transparent)];
>         m_fullscreenModel->setVideoFullscreenLayer(videoFullscreenLayer.get(), [protectedThis = WTFMove(protectedThis), this] () mutable {
>             dispatch_async(dispatch_get_main_queue(), [protectedThis = WTFMove(protectedThis), this] {
>-                m_interface->setHasVideoContentLayer(true);
>+                if (m_interface)
>+                    m_interface->setHasVideoContentLayer(true);
>             });
>         });
>     });
>@@ -260,7 +262,8 @@ void VideoFullscreenControllerContext::returnVideoContentLayer()
>         [videoFullscreenLayer setBackgroundColor:cachedCGColor(WebCore::Color::transparent)];
>         m_fullscreenModel->setVideoFullscreenLayer(nil, [protectedThis = WTFMove(protectedThis), this] () mutable {
>             dispatch_async(dispatch_get_main_queue(), [protectedThis = WTFMove(protectedThis), this] {
>-                m_interface->setHasVideoContentLayer(false);
>+                if (m_interface)
>+                    m_interface->setHasVideoContentLayer(false);
>             });
>         });
>     });
>@@ -274,14 +277,16 @@ void VideoFullscreenControllerContext::didSetupFullscreen()
>     ASSERT(isUIThread());
> #if PLATFORM(IOS) && ENABLE(FULLSCREEN_API)
>     dispatch_async(dispatch_get_main_queue(), [protectedThis = makeRefPtr(this), this] {
>-        m_interface->enterFullscreen();
>+        if (m_interface)
>+            m_interface->enterFullscreen();
>     });
> #else
>     WebThreadRun([protectedThis = makeRefPtr(this), this, videoFullscreenLayer = retainPtr([m_videoFullscreenView layer])] () mutable {
>         [videoFullscreenLayer setBackgroundColor:cachedCGColor(WebCore::Color::transparent)];
>         m_fullscreenModel->setVideoFullscreenLayer(videoFullscreenLayer.get(), [protectedThis = WTFMove(protectedThis), this] () mutable {
>             dispatch_async(dispatch_get_main_queue(), [protectedThis = WTFMove(protectedThis), this] {
>-                m_interface->enterFullscreen();
>+                if (m_interface)
>+                    m_interface->enterFullscreen();
>             });
>         });
>     });
>@@ -303,13 +308,15 @@ void VideoFullscreenControllerContext::didExitFullscreen()
>     ASSERT(isUIThread());
> #if PLATFORM(IOS) && ENABLE(FULLSCREEN_API)
>     dispatch_async(dispatch_get_main_queue(), [protectedThis = makeRefPtr(this), this] {
>-        m_interface->cleanupFullscreen();
>+        if (m_interface)
>+            m_interface->cleanupFullscreen();
>     });
> #else
>     WebThreadRun([protectedThis = makeRefPtr(this), this] () mutable {
>         m_fullscreenModel->setVideoFullscreenLayer(nil, [protectedThis = WTFMove(protectedThis), this] () mutable {
>             dispatch_async(dispatch_get_main_queue(), [protectedThis = WTFMove(protectedThis), this] {
>-                m_interface->cleanupFullscreen();
>+                if (m_interface)
>+                    m_interface->cleanupFullscreen();
>             });
>         });
>     });
>@@ -343,7 +350,8 @@ void VideoFullscreenControllerContext::fullscreenMayReturnToInline()
>     WebThreadRun([protectedThis = makeRefPtr(this), this] () mutable {
>         IntRect clientRect = elementRectInWindow(m_videoElement.get());
>         dispatch_async(dispatch_get_main_queue(), [protectedThis = WTFMove(protectedThis), this, clientRect] {
>-            m_interface->preparedToReturnToInline(true, clientRect);
>+            if (m_interface)
>+                m_interface->preparedToReturnToInline(true, clientRect);
>         });
>     });
> }
>@@ -971,7 +979,8 @@ void VideoFullscreenControllerContext::exitFullscreen()
>     IntRect clientRect = elementRectInWindow(m_videoElement.get());
>     dispatch_async(dispatch_get_main_queue(), [protectedThis = makeRefPtr(this), this, clientRect] {
>         ASSERT(isUIThread());
>-        m_interface->exitFullscreen(clientRect);
>+        if (m_interface)
>+            m_interface->exitFullscreen(clientRect);
>     });
> }
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index cc4adee92b9903207db44ab7ff064d17108742a0..a32d182254bb1c2b19dba32bf3f72c81128da603 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-08-20  Jeremy Jones  <jeremyj@apple.com>
>+
>+        UIWebView crash when enter/exit fullscreen happens too quickly.
>+        https://bugs.webkit.org/show_bug.cgi?id=188749
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added test for iOS fullscreen.
>+
>+        * media/ios/media-fullscreen-return-to-inline-expected.txt: Added.
>+        * media/ios/media-fullscreen-return-to-inline.html: Added.
>+
> 2018-08-27  Andy Estes  <aestes@apple.com>
> 
>         [Payment Request] Update payment-request web platform tests
>diff --git a/LayoutTests/media/ios/media-fullscreen-return-to-inline-expected.txt b/LayoutTests/media/ios/media-fullscreen-return-to-inline-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..ad5c1e4a31203719c23abfd40e688d74a37a3886
>--- /dev/null
>+++ b/LayoutTests/media/ios/media-fullscreen-return-to-inline-expected.txt
>@@ -0,0 +1,17 @@
>+
>+RUN(internals.settings.setAllowsInlineMediaPlayback(false))
>+RUN(internals.settings.setAllowsInlineMediaPlaybackAfterFullscreen(false))
>+RUN(video.src = findMediaFile("video", "../content/test"))
>+EVENT(canplaythrough)
>+RUN(video.play())
>+EVENT(webkitbeginfullscreen)
>+RUN(video.webkitExitFullscreen())
>+EVENT(pause)
>+RUN(internals.settings.setAllowsInlineMediaPlaybackAfterFullscreen(true))
>+RUN(video.play())
>+EVENT(webkitbeginfullscreen)
>+RUN(video.webkitExitFullscreen())
>+EVENT(webkitendfullscreen)
>+EXPECTED (video.paused == 'false') OK
>+END OF TEST
>+
>diff --git a/LayoutTests/media/ios/media-fullscreen-return-to-inline.html b/LayoutTests/media/ios/media-fullscreen-return-to-inline.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..fa3c4606e09d86179aac56e84328105ba02a0b8b
>--- /dev/null
>+++ b/LayoutTests/media/ios/media-fullscreen-return-to-inline.html
>@@ -0,0 +1,56 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+    <title>media-fullscreen-return-to-inline</title>
>+
>+    <script src="../video-test.js"></script>
>+    <script src="../media-file.js"></script>
>+
>+    <script>
>+    function go()
>+    {
>+        findMediaElement();
>+        run('internals.settings.setAllowsInlineMediaPlayback(false)');
>+        run('internals.settings.setAllowsInlineMediaPlaybackAfterFullscreen(false)');
>+        runWithKeyDown('video.src = findMediaFile("video", "../content/test")');
>+        waitForEventOnce('canplaythrough', canplaythrough);
>+    }
>+
>+    function canplaythrough()
>+    {
>+        runWithKeyDown('video.play()');
>+        waitForEventOnce('webkitbeginfullscreen', beginfullscreen1);
>+    }
>+
>+    function beginfullscreen1()
>+    {
>+        run('video.webkitExitFullscreen()');
>+        waitForEventOnce('pause', pause);
>+    }
>+
>+    function pause()
>+    {
>+        run('internals.settings.setAllowsInlineMediaPlaybackAfterFullscreen(true)');
>+        runWithKeyDown('video.play()');
>+        waitForEventOnce('webkitbeginfullscreen', beginfullscreen2);
>+    }
>+
>+    function beginfullscreen2()
>+    {
>+        run('video.webkitExitFullscreen()');
>+        waitForEventOnce('webkitendfullscreen', endfullscreen);
>+    }
>+
>+    function endfullscreen()
>+    {
>+        testExpected('video.paused', false);
>+        endTest();
>+    }
>+    </script>
>+
>+</head>
>+
>+<body onload="go()">
>+    <video controls preload="auto"></video>
>+</body>
>+</html>

Flags:

commit-queue: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 188749: 347518 | 347535 | 347544 | 348190