| 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..cc3da5190a98f2c1488ebdd1dcbcb25624765244 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"
|
| @@ -132,6 +134,12 @@ PrintWebViewHelper::~PrintWebViewHelper() {}
|
| void PrintWebViewHelper::PrintPage(WebKit::WebFrame* frame) {
|
| DCHECK(frame);
|
|
|
| + // Allow Prerendering to cancel this print request if necessary.
|
| + if (prerender::PrerenderHelper::IsPrerendering(render_view())) {
|
| + Send(new ViewHostMsg_CancelPrerenderForPrinting(routing_id()));
|
| + return;
|
| + }
|
| +
|
| if (IsScriptInitiatedPrintTooFrequent(frame))
|
| return;
|
| IncrementScriptedPrintCount();
|
|
|