diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 21:57:58 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 21:57:58 +0000 |
| commit | b849847bb652477e8670f4bebebd2d299db0130d (patch) | |
| tree | 9c7e772ca93adcb5bf0931926516921cd41365d3 /chrome/renderer/printing | |
| parent | 2c9171d2865b5b727a9bab050e1000e2d2c3cc44 (diff) | |
| download | chromium_src-b849847bb652477e8670f4bebebd2d299db0130d.zip chromium_src-b849847bb652477e8670f4bebebd2d299db0130d.tar.gz chromium_src-b849847bb652477e8670f4bebebd2d299db0130d.tar.bz2 | |
Make the renderer-side prerendering code use RenderFrames instead of RenderViews.
This is also part of the work of making ContentRendererClient's OverrideCreatePlugin and CreatePluginReplacement take only a RenderFrame.
BUG=304341
R=creis@chromium.org, mmenke@chromium.org, tburkard@chromium.org
Review URL: https://codereview.chromium.org/107893003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/printing')
| -rw-r--r-- | chrome/renderer/printing/print_web_view_helper.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/renderer/printing/print_web_view_helper.cc b/chrome/renderer/printing/print_web_view_helper.cc index c891b25..e7aa1db 100644 --- a/chrome/renderer/printing/print_web_view_helper.cc +++ b/chrome/renderer/printing/print_web_view_helper.cc @@ -20,6 +20,7 @@ #include "chrome/common/print_messages.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/prerender/prerender_helper.h" +#include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/web_preferences.h" @@ -757,7 +758,8 @@ void PrintWebViewHelper::PrintPage(blink::WebFrame* frame, DCHECK(frame); // Allow Prerendering to cancel this print request if necessary. - if (prerender::PrerenderHelper::IsPrerendering(render_view())) { + if (prerender::PrerenderHelper::IsPrerendering( + render_view()->GetMainRenderFrame())) { Send(new ChromeViewHostMsg_CancelPrerenderForPrinting(routing_id())); return; } |