diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 05:43:55 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 05:43:55 +0000 |
| commit | aae4c8d74f2367bfe9e02253cc42d3e1be07f13a (patch) | |
| tree | 43b28d9d23c855f71efc2bc3091d81472e4ecb34 /content | |
| parent | d75edae0fee063c13086ce10ba443deb4968fbde (diff) | |
| download | chromium_src-aae4c8d74f2367bfe9e02253cc42d3e1be07f13a.zip chromium_src-aae4c8d74f2367bfe9e02253cc42d3e1be07f13a.tar.gz chromium_src-aae4c8d74f2367bfe9e02253cc42d3e1be07f13a.tar.bz2 | |
Fix Mac PPAPI (out-of-process).
Oops, we forgot to initialize the WebCore system interface.
TEST=Mac Flapper runs for pages that display text, e.g., YouTube.
BUG=none
Review URL: http://codereview.chromium.org/7818005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/ppapi_plugin/ppapi_plugin_main.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc index d1dfeaa..c25ce4b 100644 --- a/content/ppapi_plugin/ppapi_plugin_main.cc +++ b/content/ppapi_plugin/ppapi_plugin_main.cc @@ -17,6 +17,10 @@ #include "sandbox/src/sandbox.h" #endif +#if defined(OS_MACOSX) +#include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.h" +#endif + #if defined(OS_WIN) sandbox::TargetServices* g_target_services = NULL; #else @@ -41,6 +45,12 @@ int PpapiPluginMain(const MainFunctionParams& parameters) { ChildProcess::WaitForDebugger("Ppapi"); } +#if defined(OS_MACOSX) + // TODO(viettrungluu): This is called in different places in processes that + // will run WebKit. This is stupid and error-prone. + InitWebCoreSystemInterface(); +#endif + MessageLoop main_message_loop; base::PlatformThread::SetName("CrPPAPIMain"); |