diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 09:29:14 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 09:29:14 +0000 |
| commit | 5c5dd2482e578f985608bc3c74eba69ee574eed3 (patch) | |
| tree | d0f7dd4d2774f767793d3ca174c6f7e97701953a /content | |
| parent | bddca151d88995d3156c75f3aaa52f47d0883776 (diff) | |
| download | chromium_src-5c5dd2482e578f985608bc3c74eba69ee574eed3.zip chromium_src-5c5dd2482e578f985608bc3c74eba69ee574eed3.tar.gz chromium_src-5c5dd2482e578f985608bc3c74eba69ee574eed3.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/ppapi_plugin_process_host.cc | 3 | ||||
| -rw-r--r-- | content/ppapi_plugin/ppapi_thread.cc | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc index a4dd416..64975c5 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -248,10 +248,9 @@ bool PpapiPluginProcessHost::Init(const PepperPluginInfo& info) { arraysize(kCommonForwardSwitches)); if (!is_broker_) { - // TODO(vtl): Stop passing flash args in the command line, on windows is + // TODO(vtl): Stop passing flash args in the command line, or windows is // going to explode. static const char* kPluginForwardSwitches[] = { - switches::kDisablePepperThreading, switches::kDisableSeccompFilterSandbox, #if defined(OS_MACOSX) switches::kEnableSandboxLogging, diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index 6aa7b80..d6971410 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -91,8 +91,6 @@ 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()); |