Cleanup PDF plugin code.

pdf/out_of_process_instance.h

 // 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.
 
 #ifndef PDF_OUT_OF_PROCESS_INSTANCE_H_
 #define PDF_OUT_OF_PROCESS_INSTANCE_H_
 
 #include <stdint.h>
 #include <string.h>
 
@@ skipping 145 matching lines @@
   void CalculateBackgroundParts();
 
   // Computes document width/height in device pixels, based on current zoom and
   // device scale
   int GetDocumentPixelWidth() const;
   int GetDocumentPixelHeight() const;
 
   // Draws a rectangle with the specified dimensions and color in our buffer.
   void FillRect(const pp::Rect& rect, uint32_t color);
 
-  void LoadUrl(const std::string& url);
-  void LoadPreviewUrl(const std::string& url);
-  void LoadUrlInternal(const std::string& url,
-                       pp::URLLoader* loader,
-                       void (OutOfProcessInstance::*method)(int32_t));
+  void LoadUrl(const std::string& url, bool is_print_preview);
 
   // Creates a URL loader and allows it to access all urls, i.e. not just the
   // frame's origin.
   pp::URLLoader CreateURLLoaderInternal();
 
   void FormDidOpen(int32_t result);
 
   void UserMetricsRecordAction(const std::string& action);
 
   // Start loading accessibility information.
@@ skipping 29 matching lines @@
   // Load the next available preview page into the blank page.
   void LoadAvailablePreviewPage();
 
   // Bound the given scroll offset to the document.
   pp::FloatPoint BoundScrollOffsetToDocument(
       const pp::FloatPoint& scroll_offset);
 
   pp::ImageData image_data_;
   // Used when the plugin is embedded in a page and we have to create the loader
   // ourself.
-  pp::CompletionCallbackFactory<OutOfProcessInstance> loader_factory_;
   pp::URLLoader embed_loader_;
   pp::URLLoader embed_preview_loader_;
 
   PP_CursorType_Dev cursor_;  // The current cursor.
 
-  pp::CompletionCallbackFactory<OutOfProcessInstance> timer_factory_;
-
   // Size, in pixels, of plugin rectangle.
   pp::Size plugin_size_;
   // Size, in DIPs, of plugin rectangle.
   pp::Size plugin_dip_size_;
   // Remaining area, in pixels, to render the pdf in after accounting for
   // horizontal centering.
   pp::Rect available_area_;
   // Size of entire document in pixels (i.e. if each page is 800 pixels high and
   // there are 10 pages, the height will be 8000).
   pp::Size document_size_;
@@ skipping 56 matching lines @@
   std::unique_ptr<PreviewModeClient> preview_client_;
 
   // This engine is used to render the individual preview page data. This is
   // used only in print preview mode. This will use |PreviewModeClient|
   // interface which has very limited access to the pp::Instance.
   std::unique_ptr<PDFEngine> preview_engine_;
 
   std::string url_;
 
   // Used for submitting forms.
-  pp::CompletionCallbackFactory<OutOfProcessInstance> form_factory_;
   pp::URLLoader form_loader_;
 
-  // Used for printing without re-entrancy issues.
-  pp::CompletionCallbackFactory<OutOfProcessInstance> print_callback_factory_;
+  pp::CompletionCallbackFactory<OutOfProcessInstance> callback_factory_;
 
   // The callback for receiving the password from the page.
   std::unique_ptr<pp::CompletionCallbackWithOutput<pp::Var>> password_callback_;
 
   // True if we haven't painted the plugin viewport yet.
   bool first_paint_;
 
   DocumentLoadState document_load_state_;
   DocumentLoadState preview_document_load_state_;
 
@@ skipping 68 matching lines @@
 
   // True if the plugin is loaded in print preview, otherwise false.
   bool is_print_preview_;
 
   DISALLOW_COPY_AND_ASSIGN(OutOfProcessInstance);
 };
 
 }  // namespace chrome_pdf
 
 #endif  // PDF_OUT_OF_PROCESS_INSTANCE_H_