Attachment 346066 Details for Bug 188171 – Patch

[patch] Patch

bug-188171-20180730101920.patch (text/plain), 2.31 KB, created by Per Arne Vollan on 2018-07-30 10:19:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Per Arne Vollan

Created: 2018-07-30 10:19:20 PDT

Size: 2.31 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 234373)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2018-07-30  Per Arne Vollan  <pvollan@apple.com>
>+
>+        [macOS] All WindowServer connections should be closed before denying WindowServer access.
>+        https://bugs.webkit.org/show_bug.cgi?id=188171
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        All WindowServer connections in the WebContent process should be closed before denying access to the WindowServer,
>+        otherwise calling CGSSetDenyWindowServerConnections(true) will fail. Currently, there are no open WindowServer
>+        connections at this point, but this might change in the future. We should call CGSShutdownServerConnections()
>+        before calling CGSSetDenyWindowServerConnections(true) to make sure WindowServer connections are always
>+        successfully denied. Thanks to Alex Gaynor at Mozilla (agaynor@mozilla.com) for identifying this issue.
>+
>+        * WebProcess/cocoa/WebProcessCocoa.mm:
>+        (WebKit::WebProcess::platformInitializeProcess):
>+
> 2018-07-30  David Fenton  <david_fenton@apple.com>
> 
>         Unreviewed, rolling out r234327.
>Index: Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
>===================================================================
>--- Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	(revision 234362)
>+++ Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	(working copy)
>@@ -314,11 +314,12 @@ void WebProcess::platformInitializeProce
> {
> #if PLATFORM(MAC)
> #if ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
>+    // Make sure we close any WindowServer connections before permanently denying them.
>+    CGSShutdownServerConnections();
>     // Deny the WebContent process access to the WindowServer.
>     // This call will not succeed if there are open WindowServer connections at this point.
>-    CGSSetDenyWindowServerConnections(true);
>-    // Make sure that we close any WindowServer connections after checking in with Launch Services.
>-    CGSShutdownServerConnections();
>+    CGError error = CGSSetDenyWindowServerConnections(true);
>+    ASSERT_UNUSED(error, error == kCGErrorSuccess);
> #else
>     if (![NSApp isRunning]) {
>         // This call is needed when the WebProcess is not running the NSApplication event loop.

Flags:

darin: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188171: 346066