Attachment 368976 Details for Bug 197574 – Patch

[patch] Patch

bug-197574-20190503133330.patch (text/plain), 3.51 KB, created by Chris Dumez on 2019-05-03 13:33:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2019-05-03 13:33:31 PDT

Size: 3.51 KB

patch

obsolete

>Subversion Revision: 244912
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 31bd96c570ec580f5e4c792313db5a4d116d0188..e8f733c8be901e16059f92d91c2543eac0749cc8 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-05-03  Chris Dumez  <cdumez@apple.com>
>+
>+        ASSERTION FAILED: [weakThis->m_view window] == weakThis->m_targetWindowForMovePreparation
>+        https://bugs.webkit.org/show_bug.cgi?id=197574
>+        <rdar://problem/50453181>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Tweak the assertion so that it holds even if the WebView gets closed because the completion
>+        handler has been called.
>+
>+        * UIProcess/Cocoa/WebViewImpl.mm:
>+        (WebKit::WebViewImpl::prepareForMoveToWindow):
>+
> 2019-05-03  Jay Mulani  <jmulani@apple.com>
> 
>         Expose full screen controller SPI to check if full screen is open and close full screen
>diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>index eebe02c941ef5953a67a3b7fb9124af46fd36ef4..0044be50817da1b0d86f42c7fb34a79e44a413c8 100644
>--- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>@@ -2375,7 +2375,7 @@ void WebViewImpl::prepareForMoveToWindow(NSWindow *targetWindow, WTF::Function<v
>         if (!weakThis)
>             return;
> 
>-        ASSERT([weakThis->m_view window] == weakThis->m_targetWindowForMovePreparation);
>+        ASSERT(![weakThis->m_view window] || [weakThis->m_view window] == weakThis->m_targetWindowForMovePreparation);
>         weakThis->m_targetWindowForMovePreparation = nil;
>     });
> 
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index fa00bb9ba3d34620e6dbe62c634db3e4bcb6e74e..b06ff54eba27162d74320cfa2a405660f85f17e2 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-05-03  Chris Dumez  <cdumez@apple.com>
>+
>+        ASSERTION FAILED: [weakThis->m_view window] == weakThis->m_targetWindowForMovePreparation
>+        https://bugs.webkit.org/show_bug.cgi?id=197574
>+        <rdar://problem/50453181>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add API test coverage.
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/PrepareForMoveToWindow.mm:
>+        (TEST):
>+
> 2019-05-03  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r244881.
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PrepareForMoveToWindow.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PrepareForMoveToWindow.mm
>index 88014ac2d7d87def03686fa2fd3f2f1fccd7eec5..f10dd381e5484b7535ce8fe952a3643899c586bb 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PrepareForMoveToWindow.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PrepareForMoveToWindow.mm
>@@ -55,4 +55,25 @@ TEST(WKWebView, PrepareForMoveToWindow)
>     TestWebKitAPI::Util::run(&isDone);
> }
> 
>+
>+TEST(WKWebView, PrepareForMoveToWindowThenClose)
>+{
>+    auto webView = adoptNS([[WKWebView alloc] init]);
>+
>+    NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"simple" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
>+    [webView loadRequest:request];
>+
>+    [webView _test_waitForDidFinishNavigation];
>+
>+    RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
>+
>+    [webView _prepareForMoveToWindow:window.get() completionHandler:[webView, window] {
>+        isDone = true;
>+    }];
>+
>+    [webView _close];
>+
>+    TestWebKitAPI::Util::run(&isDone);
>+}
>+
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 197574: 368976