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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2060933002: Let Flash join and be controlled by media session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pepper_to_contents
Patch Set: addressed dcheng's comments Created 4 years, 6 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 | « content/content_browser.gypi ('k') | media/base/media_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index e4abcb5cb5eb6bc28b6bd0f19afe1475e79382e2..478ee7ff58250b5bb587a0cc1400a4bcdbbbaf4f 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -6251,7 +6251,8 @@ void RenderFrameImpl::PepperInstanceCreated(
PepperPluginInstanceImpl* instance) {
active_pepper_instances_.insert(instance);
- Send(new FrameHostMsg_PepperInstanceCreated(routing_id_));
+ Send(new FrameHostMsg_PepperInstanceCreated(
+ routing_id_, instance->pp_instance()));
}
void RenderFrameImpl::PepperInstanceDeleted(
@@ -6264,9 +6265,12 @@ void RenderFrameImpl::PepperInstanceDeleted(
PepperFocusChanged(instance, false);
RenderFrameImpl* const render_frame = instance->render_frame();
- if (render_frame)
+ if (render_frame) {
render_frame->Send(
- new FrameHostMsg_PepperInstanceDeleted(render_frame->GetRoutingID()));
+ new FrameHostMsg_PepperInstanceDeleted(
+ render_frame->GetRoutingID(),
+ instance->pp_instance()));
+ }
}
void RenderFrameImpl::PepperFocusChanged(PepperPluginInstanceImpl* instance,
@@ -6282,13 +6286,23 @@ void RenderFrameImpl::PepperFocusChanged(PepperPluginInstanceImpl* instance,
}
void RenderFrameImpl::PepperStartsPlayback(PepperPluginInstanceImpl* instance) {
- // TODO(zqzhang): send PepperStartsPlayback message to the browser.
- // See https://crbug.com/619084
+ RenderFrameImpl* const render_frame = instance->render_frame();
+ if (render_frame) {
+ render_frame->Send(
+ new FrameHostMsg_PepperStartsPlayback(
+ render_frame->GetRoutingID(),
+ instance->pp_instance()));
+ }
}
void RenderFrameImpl::PepperStopsPlayback(PepperPluginInstanceImpl* instance) {
- // TODO(zqzhang): send PepperStopsPlayback message to the browser.
- // See https://crbug.com/619084
+ RenderFrameImpl* const render_frame = instance->render_frame();
+ if (render_frame) {
+ render_frame->Send(
+ new FrameHostMsg_PepperStopsPlayback(
+ render_frame->GetRoutingID(),
+ instance->pp_instance()));
+ }
}
void RenderFrameImpl::OnSetPepperVolume(int32_t pp_instance, double volume) {
« no previous file with comments | « content/content_browser.gypi ('k') | media/base/media_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698