Make the scripting OOP PDF API easier to use (take 2)

pdf/out_of_process_instance.cc

Index: pdf/out_of_process_instance.cc
diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc
index 58b25a9f66c9a7980a7697d7b6077faa4a5db480..d6ad71adb6724a9ac7ac9a622c22e612de183aff 100644
--- a/pdf/out_of_process_instance.cc
+++ b/pdf/out_of_process_instance.cc
@@ -267,8 +267,7 @@ OutOfProcessInstance::OutOfProcessInstance(PP_Instance instance)
       recently_sent_find_update_(false),
       received_viewport_message_(false),
       did_call_start_loading_(false),
-      stop_scrolling_(false),
-      delay_print_(false) {
+      stop_scrolling_(false) {
   loader_factory_.Initialize(this);
   timer_factory_.Initialize(this);
   form_factory_.Initialize(this);
@@ -970,11 +969,6 @@ void OutOfProcessInstance::Email(const std::string& to,
 }
 
 void OutOfProcessInstance::Print() {
-  if (document_load_state_ == LOAD_STATE_LOADING) {
-    delay_print_ = true;
-    return;
-  }
-
   if (!engine_->HasPermission(PDFEngine::PERMISSION_PRINT_LOW_QUALITY) &&
       !engine_->HasPermission(PDFEngine::PERMISSION_PRINT_HIGH_QUALITY)) {
     return;
@@ -1102,25 +1096,23 @@ void OutOfProcessInstance::DocumentLoadComplete(int page_count) {
   progress_message.Set(pp::Var(kJSProgressPercentage), pp::Var(100));
   PostMessage(progress_message);
 
-  if (full_) {
-    if (did_call_start_loading_) {
-      pp::PDF::DidStopLoading(this);
-      did_call_start_loading_ = false;
-    }
+  if (!full_)
+    return;
 
-    int content_restrictions =
-        CONTENT_RESTRICTION_CUT | CONTENT_RESTRICTION_PASTE;
-    if (!engine_->HasPermission(PDFEngine::PERMISSION_COPY))
-      content_restrictions |= CONTENT_RESTRICTION_COPY;
+  if (did_call_start_loading_) {
+    pp::PDF::DidStopLoading(this);
+    did_call_start_loading_ = false;
+  }
 
-    pp::PDF::SetContentRestriction(this, content_restrictions);
+  int content_restrictions =
+      CONTENT_RESTRICTION_CUT | CONTENT_RESTRICTION_PASTE;
+  if (!engine_->HasPermission(PDFEngine::PERMISSION_COPY))
+    content_restrictions |= CONTENT_RESTRICTION_COPY;
 
-    uma_.HistogramCustomCounts("PDF.PageCount", page_count,
-                               1, 1000000, 50);
-  }
+  pp::PDF::SetContentRestriction(this, content_restrictions);
 
-  if (delay_print_)
-    Print();
+  uma_.HistogramCustomCounts("PDF.PageCount", page_count,
+                             1, 1000000, 50);
 }
 
 void OutOfProcessInstance::RotateClockwise() {