diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 22:16:26 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 22:16:26 +0000 |
| commit | faa2a45bf31af9e1131bb0cfa17ab1e2400ec0e4 (patch) | |
| tree | f3f7c49fa06c0b32a78723f77bc3581559abb0f3 /webkit/plugins/ppapi/ppb_video_capture_impl.cc | |
| parent | de3c5ea947350a310bcdaabe7a8cb2dbef3fc9a8 (diff) | |
| download | chromium_src-faa2a45bf31af9e1131bb0cfa17ab1e2400ec0e4.zip chromium_src-faa2a45bf31af9e1131bb0cfa17ab1e2400ec0e4.tar.gz chromium_src-faa2a45bf31af9e1131bb0cfa17ab1e2400ec0e4.tar.bz2 | |
Revert 106142 - Add a new globals object for PPAPI tracking information.
This adds a specialization on the host and plugin side of the proxy. This
replaces the ad-hoc singleton tracking done by the resource and var trackers
with just being getters on this global object.
Most code can use the single PpapiGlobals class. I also allow code to get the
host and plugin specializations since some code needs access to some specific
features of each side.
In a later pass I'll move the other stuff out of TrackerBase and delete it.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/8316008
TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/8342016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi/ppb_video_capture_impl.cc')
| -rw-r--r-- | webkit/plugins/ppapi/ppb_video_capture_impl.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/webkit/plugins/ppapi/ppb_video_capture_impl.cc b/webkit/plugins/ppapi/ppb_video_capture_impl.cc index 466125c..de97914 100644 --- a/webkit/plugins/ppapi/ppb_video_capture_impl.cc +++ b/webkit/plugins/ppapi/ppb_video_capture_impl.cc @@ -12,7 +12,6 @@ #include "ppapi/c/dev/ppb_video_capture_dev.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" -#include "ppapi/shared_impl/ppapi_globals.h" #include "ppapi/thunk/enter.h" #include "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/plugin_module.h" @@ -21,7 +20,6 @@ #include "webkit/plugins/ppapi/resource_helper.h" #include "webkit/plugins/ppapi/resource_tracker.h" -using ppapi::PpapiGlobals; using ppapi::thunk::EnterResourceNoLock; using ppapi::thunk::PPB_Buffer_API; using ppapi::thunk::PPB_VideoCapture_API; @@ -267,7 +265,7 @@ void PPB_VideoCapture_Impl::OnDeviceInfoReceived( info.buffer = static_cast<PPB_Buffer_Impl*>(enter.object()); info.data = info.buffer->Map(); if (!info.data) { - PpapiGlobals::Get()->GetResourceTracker()->ReleaseResource(resources[i]); + ResourceTracker::Get()->ReleaseResource(resources[i]); break; } buffers_.push_back(info); @@ -288,7 +286,7 @@ void PPB_VideoCapture_Impl::OnDeviceInfoReceived( void PPB_VideoCapture_Impl::ReleaseBuffers() { DCHECK(!is_dead_); - ::ppapi::ResourceTracker* tracker = PpapiGlobals::Get()->GetResourceTracker(); + ResourceTracker *tracker = ResourceTracker::Get(); for (size_t i = 0; i < buffers_.size(); ++i) { buffers_[i].buffer->Unmap(); tracker->ReleaseResource(buffers_[i].buffer->pp_resource()); |