| Index: content/browser/web_contents/web_contents_impl.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
| index c6c043a1052a1ce132e5bc1d257da0073e1d9f88..4752bf7a0c469b698ee4ea7eff7d80fb52fb291b 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -3758,13 +3758,15 @@ void WebContentsImpl::OnWebUISend(const GURL& source_url,
|
| void WebContentsImpl::OnPepperInstanceCreated(int32_t pp_instance) {
|
| for (auto& observer : observers_)
|
| observer.PepperInstanceCreated();
|
| - pepper_playback_observer_->PepperInstanceCreated(pp_instance);
|
| + pepper_playback_observer_->PepperInstanceCreated(
|
| + render_frame_message_source_, pp_instance);
|
| }
|
|
|
| void WebContentsImpl::OnPepperInstanceDeleted(int32_t pp_instance) {
|
| for (auto& observer : observers_)
|
| observer.PepperInstanceDeleted();
|
| - pepper_playback_observer_->PepperInstanceDeleted(pp_instance);
|
| + pepper_playback_observer_->PepperInstanceDeleted(
|
| + render_frame_message_source_, pp_instance);
|
| }
|
|
|
| void WebContentsImpl::OnPepperPluginHung(int plugin_child_id,
|
| @@ -3777,11 +3779,13 @@ void WebContentsImpl::OnPepperPluginHung(int plugin_child_id,
|
| }
|
|
|
| void WebContentsImpl::OnPepperStartsPlayback(int32_t pp_instance) {
|
| - pepper_playback_observer_->PepperStartsPlayback(pp_instance);
|
| + pepper_playback_observer_->PepperStartsPlayback(
|
| + render_frame_message_source_, pp_instance);
|
| }
|
|
|
| void WebContentsImpl::OnPepperStopsPlayback(int32_t pp_instance) {
|
| - pepper_playback_observer_->PepperStopsPlayback(pp_instance);
|
| + pepper_playback_observer_->PepperStopsPlayback(
|
| + render_frame_message_source_, pp_instance);
|
| }
|
|
|
| void WebContentsImpl::OnPluginCrashed(const base::FilePath& plugin_path,
|
| @@ -4082,6 +4086,9 @@ void WebContentsImpl::RenderFrameCreated(RenderFrameHost* render_frame_host) {
|
| void WebContentsImpl::RenderFrameDeleted(RenderFrameHost* render_frame_host) {
|
| for (auto& observer : observers_)
|
| observer.RenderFrameDeleted(render_frame_host);
|
| +#if BUILDFLAG(ENABLE_PLUGINS)
|
| + pepper_playback_observer_->RenderFrameDeleted(render_frame_host);
|
| +#endif
|
| }
|
|
|
| void WebContentsImpl::ShowContextMenu(RenderFrameHost* render_frame_host,
|
|
|