Fixed issue with shrink output when using system print dialog.

chrome/renderer/print_web_view_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/print_web_view_helper.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 647 matching lines @@
 PrintWebViewHelper::PrintWebViewHelper(content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
       content::RenderViewObserverTracker<PrintWebViewHelper>(render_view),
       print_web_view_(NULL),
       is_preview_enabled_(IsPrintPreviewEnabled()),
       is_print_ready_metafile_sent_(false),
       ignore_css_margins_(false),
       fit_to_page_(true),
       user_cancelled_scripted_print_count_(0),
       is_scripted_printing_blocked_(false),
-      notify_browser_of_print_failure_(true) {
+      notify_browser_of_print_failure_(true),
+      printing_from_preview_(false) {
 }
 
 PrintWebViewHelper::~PrintWebViewHelper() {}
 
 bool PrintWebViewHelper::IsScriptInitiatedPrintAllowed(
     WebKit::WebFrame* frame) {
   if (is_scripted_printing_blocked_)
     return false;
   return !IsScriptInitiatedPrintTooFrequent(frame);
 }
@@ skipping 65 matching lines @@
   }
 
   WebFrame* pdf_frame = pdf_element.document().frame();
   if (!UpdatePrintSettings(pdf_frame, pdf_element, job_settings, true)) {
     LOG(ERROR) << "UpdatePrintSettings failed";
     DidFinishPrinting(FAIL_PRINT);
     return;
   }
 
   // Render Pages for printing.
+  printing_from_preview_ = true;

[Lei Zhang, 2012/04/13 21:49:18]

Do you want to move this up to line 746 and get rid of the last argument to
UpdatePrintSettings() then? Maybe make |printing_from_preview_| AutoReset?

In UpdatePrintSettings(), the parameter for this is "print_for_preview". Do you
like that name better?

[gene, 2012/04/13 22:11:02]

I am using AutoReset now and move up as suggested.
"print_for_preview" - looks good for me, done.
I would like to keep changes to the minimum, so it is easier to pick up this CL
for m19 merge. Inside UpdatePrintSettings print_for_preview is used quite
intensively, so, I would like to do this in a separate CL.

   if (!RenderPagesForPrint(pdf_frame, pdf_element)) {
     LOG(ERROR) << "RenderPagesForPrint failed";
     DidFinishPrinting(FAIL_PRINT);
   }
+  printing_from_preview_ = false;
 }
 
 bool PrintWebViewHelper::GetPrintFrame(WebKit::WebFrame** frame) {
   DCHECK(frame);
   DCHECK(render_view()->GetWebView());
   if (!render_view()->GetWebView())
     return false;
 
   // If the user has selected text in the currently focused frame we print
   // only that frame (this makes print selection work for multiple frames).
@@ skipping 1044 matching lines @@
   DCHECK(IsRendering());
   return prep_frame_view_->GetPrintCanvasSize();
 }
 
 void PrintWebViewHelper::PrintPreviewContext::ClearContext() {
   prep_frame_view_.reset();
   metafile_.reset();
   pages_to_render_.clear();
   error_ = PREVIEW_ERROR_NONE;
 }