diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 03:58:09 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 03:58:09 +0000 |
| commit | f9bc5791e39b5602b7f41716a177c8dc64ca6f00 (patch) | |
| tree | 05057334fdd68e952fa47a401d7076241063b3fb /content | |
| parent | 205e88d6758032258564a8f514b27dd1fa3c5c5e (diff) | |
| download | chromium_src-f9bc5791e39b5602b7f41716a177c8dc64ca6f00.zip chromium_src-f9bc5791e39b5602b7f41716a177c8dc64ca6f00.tar.gz chromium_src-f9bc5791e39b5602b7f41716a177c8dc64ca6f00.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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=186925
Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=186939 due to build errors
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=187340
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=187427
Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=187668 due to a failing check in Canary, which was fixed here: https://src.chromium.org/viewvc/chrome?view=rev&revision=187681
Review URL: https://chromiumcodereview.appspot.com/12378050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189518 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 236477a..e91b2b4 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -275,10 +275,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 e0bfb78..0f718af 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -93,8 +93,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()); |