Defer request to print a PDF when the user initiates the entire frame and the PDF hasn't loaded.

pdf/instance.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 "pdf/instance.h"
 
 #include <algorithm>  // for min()
 #define _USE_MATH_DEFINES  // for M_PI
 #include <cmath>      // for log() and pow()
 #include <math.h>
@@ skipping 1481 matching lines @@
   // Clear focus state for OSK.
   FormTextFieldFocusChange(false);
 
   // Update progress control.
   if (progress_bar_.visible())
     progress_bar_.Fade(false, kProgressFadeTimeoutMs);
 
   DCHECK(document_load_state_ == LOAD_STATE_LOADING);
   document_load_state_ = LOAD_STATE_COMPLETE;
   UserMetricsRecordAction("PDF.LoadSuccess");
+
+  if (did_call_start_loading_) {

[ivandavid, 2014/08/15 00:35:23]

I know you said to create a different CL for all the _NODE code. However, I
think I actually figured out the problem. The problem was that DidStopLoading()
wasn't being called before the request for print preview. Putting the call to
DidStopLoading here forces that to happen. I feel that its OK to move
DidStopLoading up here, because all its doing is changing a boolean value. The
only difference is now, when somebody prints a Google Drive Sheet a new tab will
appear and the print preview screen will immediately pop up rather than forcing
the user to click the print button again.

[Vitaly Buka (NO REVIEWS), 2014/08/15 00:58:36]

Seems reasonable.

On 2014/08/15 00:35:23, ivandavid wrote:

[Lei Zhang, 2014/08/15 02:12:55]

This looks correct. Before this change, there's 2 places that call
DidStartLoading(). One for when |full_| is true and one for when |full_| is
false. However, We only call DidStopLoading() when |full_| is true. This moves
the DidStopLoading() call to before the "if (!full_)" check below to balance the
number of calls.

+    pp::PDF::DidStopLoading(this);
+    did_call_start_loading_ = false;
+  }
+
   if (on_load_callback_.is_string())
     ExecuteScript(on_load_callback_);
   // Note: If we are in print preview mode on_load_callback_ might call
   // ScrollTo{X|Y}() and we don't want to scroll again and override it.
   // #page=N is not supported in Print Preview.
   if (!IsPrintPreview()) {
     int initial_page = GetInitialPage(url_);
     if (initial_page >= 0)
       ScrollToPage(initial_page);
   }
 
   if (!full_)
     return;
   if (!pp::PDF::IsAvailable())
     return;
 
-  if (did_call_start_loading_) {
-    pp::PDF::DidStopLoading(this);
-    did_call_start_loading_ = false;
-  }
-
   int content_restrictions =
       CONTENT_RESTRICTION_CUT | CONTENT_RESTRICTION_PASTE;
   if (!engine_->HasPermission(PDFEngine::PERMISSION_COPY))
     content_restrictions |= CONTENT_RESTRICTION_COPY;
 
   if (!engine_->HasPermission(PDFEngine::PERMISSION_PRINT_LOW_QUALITY) &&
       !engine_->HasPermission(PDFEngine::PERMISSION_PRINT_HIGH_QUALITY)) {
     printing_enabled_ = false;
     if (current_tb_info_ == kPDFToolbarButtons) {
       // Remove Print button.
@@ skipping 1188 matching lines @@
   return instance_->HasScriptableMethod(name, exception);
 }
 
 pp::Var PDFScriptableObject::Call(const pp::Var& method,
                                   const std::vector<pp::Var>& args,
                                   pp::Var* exception) {
   return instance_->CallScriptableMethod(method, args, exception);
 }
 
 }  // namespace chrome_pdf