diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 03:40:57 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 03:40:57 +0000 |
| commit | 2ba8d10b3ee068b2c29550a7976b593abc0a090a (patch) | |
| tree | f05f9132041c7e615cdaa57e2bef2fddc8c76116 /webkit | |
| parent | 19728484e137b776941a198e4d52e75022dca1bd (diff) | |
| download | chromium_src-2ba8d10b3ee068b2c29550a7976b593abc0a090a.zip chromium_src-2ba8d10b3ee068b2c29550a7976b593abc0a090a.tar.gz chromium_src-2ba8d10b3ee068b2c29550a7976b593abc0a090a.tar.bz2 | |
Put pepper threading support behind a command line flag.
Also, fix deadlock for sync browser messages by unlocking.
BUG=161429
Review URL: https://chromiumcodereview.appspot.com/11412053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/plugin_switches.cc | 3 | ||||
| -rw-r--r-- | webkit/plugins/plugin_switches.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/webkit/plugins/plugin_switches.cc b/webkit/plugins/plugin_switches.cc index bb1b3b4..98a43c2 100644 --- a/webkit/plugins/plugin_switches.cc +++ b/webkit/plugins/plugin_switches.cc @@ -15,6 +15,9 @@ const char kDisablePepper3d[] = "disable-pepper-3d"; // "Command-line" arguments for the PPAPI Flash; used for debugging options. const char kPpapiFlashArgs[] = "ppapi-flash-args"; +// Set to true to allow threadsafety support in native Pepper plugins. +const char kEnablePepperThreading[] = "enable-pepper-threading"; + #if defined(OS_WIN) // Used by the plugins_test when testing the older WMP plugin to force the new // plugin to not get loaded. diff --git a/webkit/plugins/plugin_switches.h b/webkit/plugins/plugin_switches.h index 08ed5ae..ac3a8c5 100644 --- a/webkit/plugins/plugin_switches.h +++ b/webkit/plugins/plugin_switches.h @@ -13,6 +13,7 @@ namespace switches { WEBKIT_PLUGINS_EXPORT extern const char kDebugPluginLoading[]; WEBKIT_PLUGINS_EXPORT extern const char kDisablePepper3d[]; WEBKIT_PLUGINS_EXPORT extern const char kPpapiFlashArgs[]; +WEBKIT_PLUGINS_EXPORT extern const char kEnablePepperThreading[]; #if defined(OS_WIN) WEBKIT_PLUGINS_EXPORT extern const char kUseOldWMPPlugin[]; |