diff options
| author | aberent@google.com <aberent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 11:10:10 +0000 |
|---|---|---|
| committer | aberent@google.com <aberent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 11:10:10 +0000 |
| commit | 0dfb613d4dc52d0de7b95efe71d935ef12fbd4ce (patch) | |
| tree | a44e550a178c8abb56f84ee53ac597beeca85896 /content/ppapi_plugin | |
| parent | 4867eb0439663745aace33be72575cbe09608a59 (diff) | |
| download | chromium_src-0dfb613d4dc52d0de7b95efe71d935ef12fbd4ce.zip chromium_src-0dfb613d4dc52d0de7b95efe71d935ef12fbd4ce.tar.gz chromium_src-0dfb613d4dc52d0de7b95efe71d935ef12fbd4ce.tar.bz2 | |
Revert 186925 since it breaks many of the builds on the bots (e.g.
http://build.chromium.org/p/chromium.perf/builders/Win%20Builder/builds/45240/steps/compile/logs/stdio).
> PPAPI: Remove threading options; it's always on
>
> This also re-enables thread checking for the host side resource and var trackers. Before, checking was disabled everywhere.
>
> BUG=159240,92909
>
>
> Review URL: https://chromiumcodereview.appspot.com/12378050
TBR=dmichael@chromium.org
Review URL: https://codereview.chromium.org/12504007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_thread.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index d6971410..6aa7b80 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -91,6 +91,8 @@ 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::kDisablePepperThreading)); webkit_platform_support_.reset(new PpapiWebKitPlatformSupportImpl); WebKit::initialize(webkit_platform_support_.get()); |