diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-07 14:41:21 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-07 14:41:21 +0000 |
| commit | be1bd6d3c90916bbbbfcf44422382350daef04b5 (patch) | |
| tree | f764fd8ea3b9b11ce10d9c36fe999f9790e3e0d2 | |
| parent | bb3cacb5fa4b1e43c7559bb1f421d0f7b0cd0933 (diff) | |
| download | chromium_src-be1bd6d3c90916bbbbfcf44422382350daef04b5.zip chromium_src-be1bd6d3c90916bbbbfcf44422382350daef04b5.tar.gz chromium_src-be1bd6d3c90916bbbbfcf44422382350daef04b5.tar.bz2 | |
[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
| -rw-r--r-- | content/common/sandbox_mac.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm index 9baec00..1ec3795 100644 --- a/content/common/sandbox_mac.mm +++ b/content/common/sandbox_mac.mm @@ -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 |