Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(935)

Unified Diff: content/common/sandbox_mac.mm

Issue 567693002: Revert of [Mac] Shut down connections to WindowServer before engaging the sandbox. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/sandbox_mac.mm
diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm
index a191cdc74edd474b3cada6b895e1bcaafa7282b6..9ef3e1c6cdcad0f1c44e32102d7912bef2a1225e 100644
--- a/content/common/sandbox_mac.mm
+++ b/content/common/sandbox_mac.mm
@@ -38,11 +38,6 @@
#include "ui/base/layout.h"
#include "ui/gl/gl_surface.h"
-extern "C" {
-void CGSSetDenyWindowServerConnections(bool);
-void CGSShutdownServerConnections();
-};
-
namespace content {
namespace {
@@ -273,8 +268,8 @@
kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
// Load in the color profiles we'll need (as a side effect).
- ignore_result(base::mac::GetSRGBColorSpace());
- ignore_result(base::mac::GetSystemColorSpace());
+ (void) base::mac::GetSRGBColorSpace();
+ (void) base::mac::GetSystemColorSpace();
// CGColorSpaceCreateSystemDefaultCMYK - 10.6
base::ScopedCFTypeRef<CGColorSpaceRef> cmyk_colorspace(
@@ -329,14 +324,6 @@
// Preload AppKit color spaces used for Flash/ppapi. http://crbug.com/348304
NSColor* color = [NSColor controlTextColor];
[color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
- }
-
- if (sandbox_type == SANDBOX_TYPE_RENDERER) {
- // Now disconnect from WindowServer, after all objects have been warmed up.
- // Shutting down the connection requires connecting to WindowServer,
- // so do this before actually engaging the sandbox.
- CGSSetDenyWindowServerConnections(true);
- CGSShutdownServerConnections();
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698