Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(507)

Unified Diff: ppapi/proxy/ppb_video_capture_proxy.cc

Issue 8344025: Add a new globals object for PPAPI tracking information. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/proxy/ppb_var_proxy.cc ('k') | ppapi/proxy/ppp_instance_private_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/ppb_video_capture_proxy.cc
===================================================================
--- ppapi/proxy/ppb_video_capture_proxy.cc (revision 106515)
+++ ppapi/proxy/ppb_video_capture_proxy.cc (working copy)
@@ -373,11 +373,11 @@
const PP_VideoCaptureDeviceInfo_Dev& info,
const std::vector<PPPVideoCapture_Buffer>& buffers) {
EnterPluginFromHostResource<PPB_VideoCapture_API> enter(host_resource);
- PluginResourceTracker* tracker = PluginResourceTracker::GetInstance();
- PP_Resource resource = tracker->PluginResourceForHostResource(host_resource);
- if (!resource || !ppp_video_capture_impl_ || enter.failed())
+ if (enter.failed() || !ppp_video_capture_impl_)
return;
+ PluginResourceTracker* tracker =
+ PluginGlobals::Get()->plugin_resource_tracker();
scoped_array<PP_Resource> resources(new PP_Resource[buffers.size()]);
for (size_t i = 0; i < buffers.size(); ++i) {
// We assume that the browser created a new set of resources.
@@ -386,10 +386,12 @@
buffers[i].handle,
buffers[i].size);
}
- static_cast<VideoCapture*>(enter.object())->SetBufferCount(buffers.size());
+
+ VideoCapture* capture = static_cast<VideoCapture*>(enter.object());
+ capture->SetBufferCount(buffers.size());
ppp_video_capture_impl_->OnDeviceInfo(
host_resource.instance(),
- resource,
+ capture->pp_resource(),
&info,
buffers.size(),
resources.get());
@@ -400,40 +402,38 @@
void PPP_VideoCapture_Proxy::OnMsgOnStatus(const HostResource& host_resource,
uint32_t status) {
EnterPluginFromHostResource<PPB_VideoCapture_API> enter(host_resource);
- PluginResourceTracker* tracker = PluginResourceTracker::GetInstance();
- PP_Resource resource = tracker->PluginResourceForHostResource(host_resource);
- if (!resource || !ppp_video_capture_impl_ || enter.failed())
+ if (enter.failed() || !ppp_video_capture_impl_)
return;
- if (!static_cast<VideoCapture*>(enter.object())->OnStatus(status))
+ VideoCapture* capture = static_cast<VideoCapture*>(enter.object());
+ if (!capture->OnStatus(status))
return;
ppp_video_capture_impl_->OnStatus(
- host_resource.instance(), resource, status);
+ host_resource.instance(), capture->pp_resource(), status);
}
void PPP_VideoCapture_Proxy::OnMsgOnError(const HostResource& host_resource,
uint32_t error_code) {
EnterPluginFromHostResource<PPB_VideoCapture_API> enter(host_resource);
- PluginResourceTracker* tracker = PluginResourceTracker::GetInstance();
- PP_Resource resource = tracker->PluginResourceForHostResource(host_resource);
- if (!resource || !ppp_video_capture_impl_ || enter.failed())
+ if (enter.failed() || !ppp_video_capture_impl_)
return;
- static_cast<VideoCapture*>(enter.object())->set_status(
- PP_VIDEO_CAPTURE_STATUS_STOPPED);
+
+ VideoCapture* capture = static_cast<VideoCapture*>(enter.object());
+ capture->set_status(PP_VIDEO_CAPTURE_STATUS_STOPPED);
ppp_video_capture_impl_->OnError(
- host_resource.instance(), resource, error_code);
+ host_resource.instance(), capture->pp_resource(), error_code);
}
void PPP_VideoCapture_Proxy::OnMsgOnBufferReady(
const HostResource& host_resource, uint32_t buffer) {
EnterPluginFromHostResource<PPB_VideoCapture_API> enter(host_resource);
- PluginResourceTracker* tracker = PluginResourceTracker::GetInstance();
- PP_Resource resource = tracker->PluginResourceForHostResource(host_resource);
- if (!resource || !ppp_video_capture_impl_ || enter.failed())
+ if (enter.failed() || !ppp_video_capture_impl_)
return;
- static_cast<VideoCapture*>(enter.object())->SetBufferInUse(buffer);
+
+ VideoCapture* capture = static_cast<VideoCapture*>(enter.object());
+ capture->SetBufferInUse(buffer);
ppp_video_capture_impl_->OnBufferReady(
- host_resource.instance(), resource, buffer);
+ host_resource.instance(), capture->pp_resource(), buffer);
}
} // namespace proxy
« no previous file with comments | « ppapi/proxy/ppb_var_proxy.cc ('k') | ppapi/proxy/ppp_instance_private_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698