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…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

« chrome/renderer/pepper/ppb_pdf_impl.cc ('K') | « content/renderer/pepper/pepper_url_loader_host.cc ('k') | content/renderer/pepper/renderer_ppapi_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_video_capture_host.cc

===================================================================

--- content/renderer/pepper/pepper_video_capture_host.cc (revision 213350)

+++ content/renderer/pepper/pepper_video_capture_host.cc (working copy)

@@ -15,7 +15,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;

@@ -241,8 +241,9 @@

}

webkit::ppapi::PluginDelegate* PepperVideoCaptureHost::GetPluginDelegate() {

- webkit::ppapi::PluginInstance* instance =

- renderer_ppapi_host_->GetPluginInstance(pp_instance());

+ webkit::ppapi::PluginInstanceImpl* instance =

+ static_cast<webkit::ppapi::PluginInstanceImpl*>(

+ renderer_ppapi_host_->GetPluginInstance(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();