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

Unified Diff: content/renderer/render_view_impl.cc

Issue 107893003: Make the renderer-side prerendering code use RenderFrames instead of RenderViews. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: creis review comments Created 7 years 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_view_impl.cc
===================================================================
--- content/renderer/render_view_impl.cc (revision 239602)
+++ 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;
« content/browser/web_contents/web_contents_impl.cc ('K') | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698