diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-01 02:25:54 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-01 02:25:54 +0000 |
| commit | df00bfd9f8db7c412ac71ea250aa9f2f6b1564b4 (patch) | |
| tree | 37473612e0073339da6a156d0e46cbb72fa3d170 /content/ppapi_plugin | |
| parent | b49c0117dde28ea3745b9774042e61703d10822d (diff) | |
| download | chromium_src-df00bfd9f8db7c412ac71ea250aa9f2f6b1564b4.zip chromium_src-df00bfd9f8db7c412ac71ea250aa9f2f6b1564b4.tar.gz chromium_src-df00bfd9f8db7c412ac71ea250aa9f2f6b1564b4.tar.bz2 | |
Enable Pepper threading on canary.
BUG=161286
Review URL: https://chromiumcodereview.appspot.com/11419260
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_thread.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index 7678780..2e6e255 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -61,8 +61,13 @@ PpapiThread::PpapiThread(const CommandLine& command_line, bool is_broker) globals->set_plugin_proxy_delegate(this); globals->set_command_line( command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs)); - globals->set_enable_threading( - command_line.HasSwitch(switches::kEnablePepperThreading)); + if (command_line.HasSwitch(switches::kDisablePepperThreading)) { + globals->set_enable_threading(false); + } else if (command_line.HasSwitch(switches::kEnablePepperThreading)) { + globals->set_enable_threading(true); + } else { + globals->set_enable_threading(false); + } webkit_platform_support_.reset(new PpapiWebKitPlatformSupportImpl); WebKit::initialize(webkit_platform_support_.get()); |