Commit be1bd6d3 authored by rsesek@chromium.org's avatar rsesek@chromium.org

[Mac] Move NSColor sandbox warmup to only happen for ppapi.

This is not needed for renderers, and should be scoped to the right process
type.

BUG=348304,306348
TEST=Flash and renderers do not crash.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255612 0039d316-1c4b-4281-b951-d872f2087c98
parent bb3cacb5
......@@ -277,12 +277,6 @@ void Sandbox::SandboxWarmup(int sandbox_type) {
CGColorSpaceCreateWithName(kCGColorSpaceGenericCMYK));
}
{ // -[NSColor colorUsingColorSpaceName] - 10.5.6
// Used in ppapi processes only. http://crbug.com/348304
NSColor* color = [NSColor controlTextColor];
[color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
}
{ // localtime() - 10.5.6
time_t tv = {0};
localtime(&tv);
......@@ -330,6 +324,12 @@ void Sandbox::SandboxWarmup(int sandbox_type) {
// --use-gl flag.
gfx::GLSurface::InitializeOneOff();
}
if (sandbox_type == SANDBOX_TYPE_PPAPI) {
// Preload AppKit color spaces used for Flash/ppapi. http://crbug.com/348304
NSColor* color = [NSColor controlTextColor];
[color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
}
}
// static
......
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