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

Unified Diff: content/renderer/pepper/pepper_video_capture_host.cc

Issue 19744007: Create a public API around webkit::ppapi::PluginInstance and use it in chrome. After this, webkit/p… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: review comments and undo checkdeps change Created 7 years, 5 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
Index: content/renderer/pepper/pepper_video_capture_host.cc
===================================================================
--- content/renderer/pepper/pepper_video_capture_host.cc (revision 213462)
+++ content/renderer/pepper/pepper_video_capture_host.cc (working copy)
@@ -4,6 +4,7 @@
#include "content/renderer/pepper/pepper_video_capture_host.h"
+#include "content/renderer/pepper/renderer_ppapi_host_impl.h"
#include "ppapi/host/dispatch_host_message.h"
#include "ppapi/host/ppapi_host.h"
#include "ppapi/proxy/host_dispatcher.h"
@@ -15,7 +16,7 @@
#include "third_party/WebKit/public/web/WebElement.h"
#include "third_party/WebKit/public/web/WebPluginContainer.h"
#include "webkit/plugins/ppapi/host_globals.h"
-#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
+#include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"
using ppapi::HostResource;
using ppapi::TrackedCallback;
@@ -33,7 +34,7 @@
namespace content {
-PepperVideoCaptureHost::PepperVideoCaptureHost(RendererPpapiHost* host,
+PepperVideoCaptureHost::PepperVideoCaptureHost(RendererPpapiHostImpl* host,
PP_Instance instance,
PP_Resource resource)
: ResourceHost(host->GetPpapiHost(), instance, resource),
@@ -241,8 +242,8 @@
}
webkit::ppapi::PluginDelegate* PepperVideoCaptureHost::GetPluginDelegate() {
- webkit::ppapi::PluginInstance* instance =
- renderer_ppapi_host_->GetPluginInstance(pp_instance());
+ webkit::ppapi::PluginInstanceImpl* instance =
+ renderer_ppapi_host_->GetPluginInstanceImpl(pp_instance());
if (instance)
return instance->delegate();
return NULL;
@@ -269,7 +270,7 @@
platform_video_capture_ =
plugin_delegate->CreateVideoCapture(device_id,
- instance->container()->element().document().url(), this);
+ instance->GetContainer()->element().document().url(), this);
open_reply_context_ = context->MakeReplyMessageContext();
« no previous file with comments | « content/renderer/pepper/pepper_video_capture_host.h ('k') | content/renderer/pepper/renderer_ppapi_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698