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

Unified Diff: content/common/sandbox_mac.mm

Issue 186803004: [Mac] Move NSColor sandbox warmup to only happen for ppapi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 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
« 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