Commit 53ffdf90 authored by noel's avatar noel Committed by Commit bot

Revert of [Mac] Shut down connections to WindowServer before engaging the...

Revert of [Mac] Shut down connections to WindowServer before engaging the sandbox. (patchset #1 id:1 of https://codereview.chromium.org/545603002/)

Reason for revert:
Speculative revert: seems this change caused 135 layout tests failures on the webkit mac builders, from OSX 10.6-10.9

http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Mac10.6%20%28deps%29/builds/30830

Original issue's description:
> [Mac] Shut down connections to WindowServer before engaging the sandbox.
>
> The connection is only needed during sandbox warmup to initialize the default
> color space. It was formerly needed by scrollbar NSAnimations, but that was
> replaced via https://codereview.chromium.org/529103002/.
>
> BUG=397642,306348
> TEST=Manually tested on 10.6-10.10.
> R=avi@chromium.org
>
> Committed: https://chromium.googlesource.com/chromium/src/+/d9707172e540487d14c53363c5d1c2151999c2d8

TBR=avi@chromium.org,rsesek@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=397642,306348

Review URL: https://codereview.chromium.org/550763002

Cr-Commit-Position: refs/heads/master@{#293653}
parent ed5176ba
...@@ -18,11 +18,6 @@ ...@@ -18,11 +18,6 @@
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "content/common/sandbox_init_mac.h" #include "content/common/sandbox_init_mac.h"
extern "C" {
void CGSSetDenyWindowServerConnections(bool);
void CGSShutdownServerConnections();
};
namespace content { namespace content {
namespace { namespace {
...@@ -141,12 +136,6 @@ void RendererMainPlatformDelegate::PlatformUninitialize() { ...@@ -141,12 +136,6 @@ void RendererMainPlatformDelegate::PlatformUninitialize() {
} }
bool RendererMainPlatformDelegate::EnableSandbox() { bool RendererMainPlatformDelegate::EnableSandbox() {
// Disconnect from WindowServer before entering the sandbox, after all
// objects have been warmed up. Shutting down the connection requires
// connecting to WindowServer, so do this before engaging the sandbox.
CGSSetDenyWindowServerConnections(true);
CGSShutdownServerConnections();
// Enable the sandbox. // Enable the sandbox.
bool sandbox_initialized = InitializeSandbox(); bool sandbox_initialized = InitializeSandbox();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment