diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-12 08:15:39 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-12 08:15:39 +0000 |
| commit | 2916256f6eac115c39af90cdf391b52419f8cb7c (patch) | |
| tree | 4c87ce1e40f26e271766502a29d37a22ce83f89f /ppapi/proxy/plugin_resource_tracker.cc | |
| parent | 3442a664129c54f09ec39ece7bfad7750aca1128 (diff) | |
| download | chromium_src-2916256f6eac115c39af90cdf391b52419f8cb7c.zip chromium_src-2916256f6eac115c39af90cdf391b52419f8cb7c.tar.gz chromium_src-2916256f6eac115c39af90cdf391b52419f8cb7c.tar.bz2 | |
Make it possible to have 1 PpapiGlobals per thread. Update unit tests.
This allows us to distinguish trackers in the unit tests, instead of all vars/resources going in 1 tracker. This should also allow us to unit-test PPB proxies.
BUG=
TEST=
Review URL: http://codereview.chromium.org/9034035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/plugin_resource_tracker.cc')
| -rw-r--r-- | ppapi/proxy/plugin_resource_tracker.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ppapi/proxy/plugin_resource_tracker.cc b/ppapi/proxy/plugin_resource_tracker.cc index 3fee320..ac28de3 100644 --- a/ppapi/proxy/plugin_resource_tracker.cc +++ b/ppapi/proxy/plugin_resource_tracker.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -18,17 +18,9 @@ namespace ppapi { namespace proxy { PluginResourceTracker::PluginResourceTracker() { -#ifdef ENABLE_PEPPER_THREADING - // Set the global proxy lock, since the plugin-side of the proxy needs to be - // synchronized. - ppapi::ProxyLock::Set(&proxy_lock_); -#endif } PluginResourceTracker::~PluginResourceTracker() { -#ifdef ENABLE_PEPPER_THREADING - ppapi::ProxyLock::Reset(); -#endif } PP_Resource PluginResourceTracker::PluginResourceForHostResource( |