diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-30 17:08:13 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-30 17:08:13 +0000 |
| commit | b73c659d632b24e11e2316a0285b5475ccffc3e2 (patch) | |
| tree | 230cb5a0b468612ffa41e9c4af9052f32fd3cf52 /ppapi/proxy/plugin_var_tracker.cc | |
| parent | 29190fda701edd26bf862b3d3b91bab66fe2c88b (diff) | |
| download | chromium_src-b73c659d632b24e11e2316a0285b5475ccffc3e2.zip chromium_src-b73c659d632b24e11e2316a0285b5475ccffc3e2.tar.gz chromium_src-b73c659d632b24e11e2316a0285b5475ccffc3e2.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)
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=191420
Reverted: r191441, due to new failing PDFResource unit test.
Review URL: https://chromiumcodereview.appspot.com/12378050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191510 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/plugin_var_tracker.cc')
| -rw-r--r-- | ppapi/proxy/plugin_var_tracker.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/ppapi/proxy/plugin_var_tracker.cc b/ppapi/proxy/plugin_var_tracker.cc index cff8fa1..14a8584 100644 --- a/ppapi/proxy/plugin_var_tracker.cc +++ b/ppapi/proxy/plugin_var_tracker.cc @@ -31,7 +31,7 @@ bool PluginVarTracker::HostVar::operator<(const HostVar& other) const { return host_object_id < other.host_object_id; } -PluginVarTracker::PluginVarTracker() { +PluginVarTracker::PluginVarTracker() : VarTracker(THREAD_SAFE) { } PluginVarTracker::~PluginVarTracker() { @@ -39,7 +39,7 @@ PluginVarTracker::~PluginVarTracker() { PP_Var PluginVarTracker::ReceiveObjectPassRef(const PP_Var& host_var, PluginDispatcher* dispatcher) { - DCHECK(CalledOnValidThread()); + CheckThreadingPreconditions(); DCHECK(host_var.type == PP_VARTYPE_OBJECT); // Get the object. @@ -65,7 +65,7 @@ PP_Var PluginVarTracker::ReceiveObjectPassRef(const PP_Var& host_var, PP_Var PluginVarTracker::TrackObjectWithNoReference( const PP_Var& host_var, PluginDispatcher* dispatcher) { - DCHECK(CalledOnValidThread()); + CheckThreadingPreconditions(); DCHECK(host_var.type == PP_VARTYPE_OBJECT); // Get the object. @@ -83,7 +83,7 @@ PP_Var PluginVarTracker::TrackObjectWithNoReference( void PluginVarTracker::StopTrackingObjectWithNoReference( const PP_Var& plugin_var) { - DCHECK(CalledOnValidThread()); + CheckThreadingPreconditions(); DCHECK(plugin_var.type == PP_VARTYPE_OBJECT); VarMap::iterator found = GetLiveVar(plugin_var); @@ -98,8 +98,7 @@ void PluginVarTracker::StopTrackingObjectWithNoReference( } PP_Var PluginVarTracker::GetHostObject(const PP_Var& plugin_object) const { - DCHECK(CalledOnValidThread()); - + CheckThreadingPreconditions(); if (plugin_object.type != PP_VARTYPE_OBJECT) { NOTREACHED(); return PP_MakeUndefined(); @@ -120,8 +119,7 @@ PP_Var PluginVarTracker::GetHostObject(const PP_Var& plugin_object) const { PluginDispatcher* PluginVarTracker::DispatcherForPluginObject( const PP_Var& plugin_object) const { - DCHECK(CalledOnValidThread()); - + CheckThreadingPreconditions(); if (plugin_object.type != PP_VARTYPE_OBJECT) return NULL; @@ -137,7 +135,7 @@ PluginDispatcher* PluginVarTracker::DispatcherForPluginObject( void PluginVarTracker::ReleaseHostObject(PluginDispatcher* dispatcher, const PP_Var& host_object) { - DCHECK(CalledOnValidThread()); + CheckThreadingPreconditions(); DCHECK(host_object.type == PP_VARTYPE_OBJECT); // Convert the host object to a normal var valid in the plugin. |