diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit2/PluginProcess/mac | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit2/PluginProcess/mac')
| -rw-r--r-- | Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm b/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm index d39353a..5bb80a2 100644 --- a/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm +++ b/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Apple Inc. All rights reserved. + * Copyright (C) 2010, 2011 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -31,11 +31,12 @@ #import "CommandLine.h" #import "PluginProcess.h" #import "RunLoop.h" +#import <WebKitSystemInterface.h> #import <runtime/InitializeThreading.h> #import <servers/bootstrap.h> +#import <wtf/RetainPtr.h> #import <wtf/text/CString.h> #import <wtf/text/WTFString.h> -#import <WebKitSystemInterface.h> // FIXME: We should be doing this another way. extern "C" kern_return_t bootstrap_look_up2(mach_port_t, const name_t, mach_port_t*, pid_t, uint64_t); @@ -64,7 +65,12 @@ int PluginProcessMain(const CommandLine& commandLine) printf("bootstrap_look_up2 result: %x", kr); return EXIT_FAILURE; } - + + String localization = commandLine["localization"]; + RetainPtr<CFStringRef> cfLocalization(AdoptCF, CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(localization.characters()), localization.length())); + if (cfLocalization) + WKSetDefaultLocalization(cfLocalization.get()); + #if !SHOW_CRASH_REPORTER // Installs signal handlers that exit on a crash so that CrashReporter does not show up. signal(SIGILL, _exit); |