| Index: content/common/sandbox_mac.mm
|
| diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm
|
| index 9baec00d8ce99f946d47cf651d9bef9aa84a6c4c..1ec37956b53ce3a3b1ddaca9bc3fcaafcf3459bf 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
|
|
|