summaryrefslogtreecommitdiffstats
path: root/content/ppapi_plugin
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-29 19:18:41 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-29 19:18:41 +0000
commit460d2fd0876fddb9e6a2a17cba9c70beb93dfa03 (patch)
tree4e0cf902613ff0a64a7fa69959e48a0160bbf2f2 /content/ppapi_plugin
parentb26ac3b182b8c63192ad1f8e221ceac3fe5927be (diff)
downloadchromium_src-460d2fd0876fddb9e6a2a17cba9c70beb93dfa03.zip
chromium_src-460d2fd0876fddb9e6a2a17cba9c70beb93dfa03.tar.gz
chromium_src-460d2fd0876fddb9e6a2a17cba9c70beb93dfa03.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: r186925 Reverted: r186939 due to build errors Committed: r187340 Committed: r187427 Reverted: r187668 due to a failing check in Canary, which was fixed here: r187681 Committed: r189518 Reverted: r189682, due to regression in Kraken (see crbug.com/222741) Review URL: https://chromiumcodereview.appspot.com/12378050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
-rw-r--r--content/ppapi_plugin/ppapi_thread.cc2
1 files changed, 0 insertions, 2 deletions
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());