summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornoel <noel@chromium.org>2014-09-06 21:39:06 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-07 04:41:17 +0000
commit53ffdf90f4646dbde8df72007fbdc97f3f0220de (patch)
treeaf049608f9c73b6f987a475b5119b44d7e7a5d2e
parented5176ba319a6a8ca6fdbe016ce861dd09ac6f19 (diff)
downloadchromium_src-53ffdf90f4646dbde8df72007fbdc97f3f0220de.zip
chromium_src-53ffdf90f4646dbde8df72007fbdc97f3f0220de.tar.gz
chromium_src-53ffdf90f4646dbde8df72007fbdc97f3f0220de.tar.bz2
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}
-rw-r--r--content/renderer/renderer_main_platform_delegate_mac.mm11
1 files changed, 0 insertions, 11 deletions
diff --git a/content/renderer/renderer_main_platform_delegate_mac.mm b/content/renderer/renderer_main_platform_delegate_mac.mm
index 4e36f81..98b0aa4 100644
--- a/content/renderer/renderer_main_platform_delegate_mac.mm
+++ b/content/renderer/renderer_main_platform_delegate_mac.mm
@@ -18,11 +18,6 @@
#include "content/public/common/content_switches.h"
#include "content/common/sandbox_init_mac.h"
-extern "C" {
-void CGSSetDenyWindowServerConnections(bool);
-void CGSShutdownServerConnections();
-};
-
namespace content {
namespace {
@@ -141,12 +136,6 @@ void RendererMainPlatformDelegate::PlatformUninitialize() {
}
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.
bool sandbox_initialized = InitializeSandbox();