Fix a Chrome renderer crash which occurs on closing the print dialog right after it was opened. This is because of attempting to

calculate the printable area while the settings are invalid leading to a divide by zero crash.

Fixes bug http://code.google.com/p/chromium/issues/detail?id=48493

Bug=48493


Review URL: http://codereview.chromium.org/2809053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51901 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 4 deletions

diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc
index d816a8d..ef0dd14 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -132,10 +132,9 @@ void PrintWebViewHelper::Print(WebFrame* frame, bool script_initiated) {
       return;
     }
 
-    UpdatePrintableSizeInPrintParameters(frame, &default_settings);
-
     // Continue only if the settings are valid.
     if (default_settings.dpi && default_settings.document_cookie) {
+      UpdatePrintableSizeInPrintParameters(frame, &default_settings);
       int expected_pages_count = 0;
       bool use_browser_overlays = true;
 
@@ -176,11 +175,10 @@ void PrintWebViewHelper::Print(WebFrame* frame, bool script_initiated) {
         if (Send(msg)) {
           msg = NULL;
 
-          UpdatePrintableSizeInPrintParameters(frame, &print_settings.params);
-
           // If the settings are invalid, early quit.
           if (print_settings.params.dpi &&
               print_settings.params.document_cookie) {
+            UpdatePrintableSizeInPrintParameters(frame, &print_settings.params);
             if (print_settings.params.selection_only) {
               CopyAndPrint(print_settings, frame);
             } else {