Index: content/renderer/render_view_impl.cc |
=================================================================== |
--- content/renderer/render_view_impl.cc (revision 239848) |
+++ content/renderer/render_view_impl.cc (working copy) |
@@ -2981,6 +2981,15 @@ |
WebMediaPlayer* RenderViewImpl::createMediaPlayer( |
WebFrame* frame, const blink::WebURL& url, WebMediaPlayerClient* client) { |
+ NOTREACHED(); |
+ return NULL; |
+} |
+ |
+blink::WebMediaPlayer* RenderViewImpl::CreateMediaPlayer( |
+ RenderFrame* render_frame, |
+ blink::WebFrame* frame, |
+ const blink::WebURL& url, |
+ blink::WebMediaPlayerClient* client) { |
FOR_EACH_OBSERVER( |
RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); |
@@ -3003,7 +3012,7 @@ |
RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), |
base::Bind(&ContentRendererClient::DeferMediaLoad, |
base::Unretained(GetContentClient()->renderer()), |
- static_cast<RenderView*>(this)), |
+ static_cast<RenderFrame*>(render_frame)), |
sink, |
RenderThreadImpl::current()->GetGpuFactories(), |
new RenderMediaLog()); |
@@ -4232,6 +4241,10 @@ |
return RenderWidget::Send(message); |
} |
+RenderFrame* RenderViewImpl::GetMainRenderFrame() { |
+ return main_render_frame_.get(); |
+} |
+ |
int RenderViewImpl::GetRoutingID() const { |
return routing_id_; |
} |
@@ -6020,8 +6033,9 @@ |
blink::WebPageVisibilityStateHidden : |
blink::WebPageVisibilityStateVisible; |
blink::WebPageVisibilityState override_state = current_state; |
+ // TODO(jam): move this method to WebFrameClient. |
if (GetContentClient()->renderer()-> |
- ShouldOverridePageVisibilityState(this, |
+ ShouldOverridePageVisibilityState(main_render_frame_.get(), |
&override_state)) |
return override_state; |
return current_state; |