Title: [282936] branches/safari-612-branch/Source
- Revision
- 282936
- Author
- repst...@apple.com
- Date
- 2021-09-22 22:14:02 -0700 (Wed, 22 Sep 2021)
Log Message
Cherry-pick r282157. rdar://problem/83429907
Remove unneeded call on startup of WebContent process
https://bugs.webkit.org/show_bug.cgi?id=230022
<rdar://problem/82838000>
Reviewed by Darin Adler.
Source/WebCore/PAL:
* pal/spi/cg/CoreGraphicsSPI.h:
Source/WebKit:
There is no need to call CGSShutdownServerConnections during startup of the WebContent process on macOS,
since we already have asserted that there are no open connections at this point.
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeProcess):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282157 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612-branch/Source/WebCore/PAL/ChangeLog (282935 => 282936)
--- branches/safari-612-branch/Source/WebCore/PAL/ChangeLog 2021-09-23 05:13:58 UTC (rev 282935)
+++ branches/safari-612-branch/Source/WebCore/PAL/ChangeLog 2021-09-23 05:14:02 UTC (rev 282936)
@@ -1,3 +1,38 @@
+2021-09-22 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r282157. rdar://problem/83429907
+
+ Remove unneeded call on startup of WebContent process
+ https://bugs.webkit.org/show_bug.cgi?id=230022
+ <rdar://problem/82838000>
+
+ Reviewed by Darin Adler.
+
+ Source/WebCore/PAL:
+
+ * pal/spi/cg/CoreGraphicsSPI.h:
+
+ Source/WebKit:
+
+ There is no need to call CGSShutdownServerConnections during startup of the WebContent process on macOS,
+ since we already have asserted that there are no open connections at this point.
+
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeProcess):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282157 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-09-08 Per Arne <pvol...@apple.com>
+
+ Remove unneeded call on startup of WebContent process
+ https://bugs.webkit.org/show_bug.cgi?id=230022
+ <rdar://problem/82838000>
+
+ Reviewed by Darin Adler.
+
+ * pal/spi/cg/CoreGraphicsSPI.h:
+
2021-09-09 Russell Epstein <repst...@apple.com>
Cherry-pick r281792. rdar://problem/82949614
Modified: branches/safari-612-branch/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h (282935 => 282936)
--- branches/safari-612-branch/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h 2021-09-23 05:13:58 UTC (rev 282935)
+++ branches/safari-612-branch/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h 2021-09-23 05:14:02 UTC (rev 282936)
@@ -335,8 +335,6 @@
bool CGDisplayUsesForceToGray(void);
-void CGSShutdownServerConnections(void);
-
CGSConnectionID CGSMainConnectionID(void);
CFArrayRef CGSHWCaptureWindowList(CGSConnectionID, CGSWindowIDList windowList, CGSWindowCount, CGSWindowCaptureOptions);
CGError CGSSetConnectionProperty(CGSConnectionID, CGSConnectionID ownerCid, CFStringRef key, CFTypeRef value);
Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (282935 => 282936)
--- branches/safari-612-branch/Source/WebKit/ChangeLog 2021-09-23 05:13:58 UTC (rev 282935)
+++ branches/safari-612-branch/Source/WebKit/ChangeLog 2021-09-23 05:14:02 UTC (rev 282936)
@@ -1,5 +1,44 @@
2021-09-22 Alan Coon <alanc...@apple.com>
+ Cherry-pick r282157. rdar://problem/83429907
+
+ Remove unneeded call on startup of WebContent process
+ https://bugs.webkit.org/show_bug.cgi?id=230022
+ <rdar://problem/82838000>
+
+ Reviewed by Darin Adler.
+
+ Source/WebCore/PAL:
+
+ * pal/spi/cg/CoreGraphicsSPI.h:
+
+ Source/WebKit:
+
+ There is no need to call CGSShutdownServerConnections during startup of the WebContent process on macOS,
+ since we already have asserted that there are no open connections at this point.
+
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeProcess):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282157 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-09-08 Per Arne <pvol...@apple.com>
+
+ Remove unneeded call on startup of WebContent process
+ https://bugs.webkit.org/show_bug.cgi?id=230022
+ <rdar://problem/82838000>
+
+ Reviewed by Darin Adler.
+
+ There is no need to call CGSShutdownServerConnections during startup of the WebContent process on macOS,
+ since we already have asserted that there are no open connections at this point.
+
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeProcess):
+
+2021-09-22 Alan Coon <alanc...@apple.com>
+
Cherry-pick r282114. rdar://problem/83429649
Fix incorrect preprocess guard in WebContent sandbox
Modified: branches/safari-612-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (282935 => 282936)
--- branches/safari-612-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2021-09-23 05:13:58 UTC (rev 282935)
+++ branches/safari-612-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2021-09-23 05:14:02 UTC (rev 282936)
@@ -632,8 +632,6 @@
// This call will not succeed if there are open WindowServer connections at this point.
auto retval = CGSSetDenyWindowServerConnections(true);
RELEASE_ASSERT(retval == kCGErrorSuccess);
- // Make sure that we close any WindowServer connections after checking in with Launch Services.
- CGSShutdownServerConnections();
SwitchingGPUClient::setSingleton(WebSwitchingGPUClient::singleton());
MainThreadSharedTimer::shouldSetupPowerObserver() = false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
