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

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: modified when to add/remove player to/from MediaSession 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
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index a2338e8b16795f569336cf93aafaffd6c0f01248..c4872d8e7a29a158e5daafdb9c76142d8864bfbc 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -6212,7 +6212,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(
@@ -6227,7 +6228,9 @@ void RenderFrameImpl::PepperInstanceDeleted(
RenderFrameImpl* const render_frame = instance->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,
@@ -6243,11 +6246,21 @@ void RenderFrameImpl::PepperFocusChanged(PepperPluginInstanceImpl* instance,
}
void RenderFrameImpl::PepperStartsPlayback(PepperPluginInstanceImpl* instance) {
- // TODO(zqzhang): send PepperStartsPlayback message to the browser.
+ RenderFrameImpl* const render_frame = instance->render_frame();
+ if (render_frame)
mlamouri (slow - plz ping) 2016/06/24 15:33:32 style: add { }
Zhiqiang Zhang (Slow) 2016/06/24 17:43:21 Done.
+ 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.
+ RenderFrameImpl* const render_frame = instance->render_frame();
+ if (render_frame)
mlamouri (slow - plz ping) 2016/06/24 15:33:32 style: add { }
Zhiqiang Zhang (Slow) 2016/06/24 17:43:21 Done.
+ render_frame->Send(
+ new FrameHostMsg_PepperStopsPlayback(
+ render_frame->GetRoutingID(),
+ instance->pp_instance()));
}
void RenderFrameImpl::OnSetPepperVolume(int32_t pp_instance, double volume) {

Powered by Google App Engine
This is Rietveld 408576698