Cancel prerenders for pages that call window.print()

chrome/renderer/print_web_view_helper.cc

Index: chrome/renderer/print_web_view_helper.cc
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc
index f07ef87d18e5f1e4be2ed4746333b5b9a449c9ba..467fd6b0e5e4373d51d8a786e238083edb2bb586 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -12,6 +12,8 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/print_messages.h"
+#include "chrome/common/render_messages.h"
+#include "chrome/renderer/prerender/prerender_helper.h"
 #include "content/renderer/render_view.h"
 #include "grit/generated_resources.h"
 #include "printing/metafile.h"
@@ -269,6 +271,13 @@ void PrintWebViewHelper::Print(WebKit::WebFrame* frame, WebKit::WebNode* node) {
   if (print_web_view_)
     return;
 
+  // Allow Prerendering to cancel this if necessary.

[Lei Zhang, 2011/05/14 04:11:56]

I would put this at the top of PrintWebViewHelper::PrintPage(). If you put it
here, it doesn't handle the case of when print preview is enabled.

[dominich, 2011/05/16 16:28:00]

Done.

+  if (prerender::PrerenderHelper::IsPrerendering(render_view())) {
+    Send(new ViewHostMsg_CancelPrerenderForPrinting(
+        render_view()->routing_id()));
+    return;
+  }
+
   // Initialize print settings.
   if (!InitPrintSettings(frame, node))
     return;  // Failed to init print page settings.