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

Unified Diff: chrome/renderer/printing/chrome_print_web_view_helper_delegate.cc

Issue 2426503002: Make printing work better with OOPIF. (Closed)
Patch Set: Fix build, nits Created 4 years, 2 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: chrome/renderer/printing/chrome_print_web_view_helper_delegate.cc
diff --git a/chrome/renderer/printing/chrome_print_web_view_helper_delegate.cc b/chrome/renderer/printing/chrome_print_web_view_helper_delegate.cc
index d20b8aafc887f834fdbe540318ef29f1f39eda0d..d98116faa10c95502ac605deabc043b9a2eb7439 100644
--- a/chrome/renderer/printing/chrome_print_web_view_helper_delegate.cc
+++ b/chrome/renderer/printing/chrome_print_web_view_helper_delegate.cc
@@ -25,17 +25,16 @@
#include "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h"
#endif // defined(ENABLE_EXTENSIONS)
-ChromePrintWebViewHelperDelegate::~ChromePrintWebViewHelperDelegate(){
-}
+ChromePrintWebViewHelperDelegate::~ChromePrintWebViewHelperDelegate() {}
bool ChromePrintWebViewHelperDelegate::CancelPrerender(
- content::RenderView* render_view, int routing_id) {
- if (!render_view || !prerender::PrerenderHelper::IsPrerendering(
- render_view->GetMainRenderFrame()))
+ content::RenderFrame* render_frame) {
+ if (!prerender::PrerenderHelper::IsPrerendering(render_frame))
return false;
- return render_view->Send(
- new ChromeViewHostMsg_CancelPrerenderForPrinting(routing_id));
+ auto* render_view = render_frame->GetRenderView();
+ return render_view->Send(new ChromeViewHostMsg_CancelPrerenderForPrinting(
+ render_view->GetRoutingID()));
nasko 2016/11/02 04:50:37 Why is this still using the RenderView routing id?
Lei Zhang 2016/11/08 11:13:22 PrerenderContents hasn't changed in this CL, so we
nasko 2016/11/08 22:18:35 Acknowledged.
}
// Return the PDF object element if |frame| is the out of process PDF extension.

Powered by Google App Engine
This is Rietveld 408576698