Revert "reland of Improve linearized pdf load/show time."

pdf/pdfium/pdfium_engine.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_PDFIUM_PDFIUM_ENGINE_H_
 #define PDF_PDFIUM_PDFIUM_ENGINE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 90 matching lines @@
                       pp::FloatRect* out_bounds) override;
   bool GetPrintScaling() override;
   int GetCopiesToPrint() override;
   int GetDuplexType() override;
   bool GetPageSizeAndUniformity(pp::Size* size) override;
   void AppendBlankPages(int num_pages) override;
   void AppendPage(PDFEngine* engine, int index) override;
 #if defined(PDF_ENABLE_XFA)
   void SetScrollPosition(const pp::Point& position) override;
 #endif
+  bool IsProgressiveLoad() override;
   std::string GetMetadata(const std::string& key) override;
 
   // DocumentLoader::Client implementation.
   pp::Instance* GetPluginInstance() override;
-  std::unique_ptr<URLLoaderWrapper> CreateURLLoader() override;
+  pp::URLLoader CreateURLLoader() override;
+  void OnPartialDocumentLoaded() override;
   void OnPendingRequestComplete() override;
   void OnNewDataAvailable() override;
+  void OnDocumentFailed() override;
   void OnDocumentComplete() override;
-  void OnDocumentCanceled() override;
-  void CancelBrowserDownload() override;
 
   void UnsupportedFeature(int type);
   void FontSubstituted();
 
   std::string current_find_text() const { return current_find_text_; }
 
   FPDF_DOCUMENT doc() { return doc_; }
   FPDF_FORMHANDLE form() { return form_; }
 
  private:
@@ skipping 53 matching lines @@
    private:
     bool valid_;  // Whether |index_| is valid or not.
     size_t index_;  // The current search result, 0-based.
 
     DISALLOW_COPY_AND_ASSIGN(FindTextIndex);
   };
 
   friend class SelectionChangeInvalidator;
 
   struct FileAvail : public FX_FILEAVAIL {
-    PDFiumEngine* engine;
+    DocumentLoader* loader;
   };
 
   struct DownloadHints : public FX_DOWNLOADHINTS {
-    PDFiumEngine* engine;
+    DocumentLoader* loader;
   };
 
   // PDFium interface to get block of data.
   static int GetBlock(void* param, unsigned long position,
                       unsigned char* buffer, unsigned long size);
 
   // PDFium interface to check is block of data is available.
   static FPDF_BOOL IsDataAvail(FX_FILEAVAIL* param,
                                size_t offset, size_t size);
 
@@ skipping 386 matching lines @@
 
   // The scroll position in screen coordinates.
   pp::Point position_;
   // The offset of the page into the viewport.
   pp::Point page_offset_;
   // The plugin size in screen coordinates.
   pp::Size plugin_size_;
   double current_zoom_;
   unsigned int current_rotation_;
 
-  std::unique_ptr<DocumentLoader> doc_loader_;  // Main document's loader.
+  DocumentLoader doc_loader_;  // Main document's loader.
   std::string url_;
   std::string headers_;
   pp::CompletionCallbackFactory<PDFiumEngine> find_factory_;
 
   pp::CompletionCallbackFactory<PDFiumEngine> password_factory_;
   int32_t password_tries_remaining_;
 
   // The current text used for searching.
   std::string current_find_text_;
 
@@ skipping 108 matching lines @@
   // The timeout to use for the current progressive paint.
   int progressive_paint_timeout_;
 
   // Shadow matrix for generating the page shadow bitmap.
   std::unique_ptr<ShadowMatrix> page_shadow_;
 
   // Set to true if the user is being prompted for their password. Will be set
   // to false after the user finishes getting their password.
   bool getting_password_;
 
-  // While true, the document try to be opened and parsed after download each
-  // part. Else the document will be opened and parsed only on finish of
-  // downloading.
-  bool process_when_pending_request_complete_ = true;
-
   DISALLOW_COPY_AND_ASSIGN(PDFiumEngine);
 };
 
 // Create a local variable of this when calling PDFium functions which can call
 // our global callback when an unsupported feature is reached.
 class ScopedUnsupportedFeature {
  public:
   explicit ScopedUnsupportedFeature(PDFiumEngine* engine);
   ~ScopedUnsupportedFeature();
 
@@ skipping 44 matching lines @@
   bool GetPDFPageSizeByIndex(const void* pdf_buffer,
                              int pdf_buffer_size,
                              int page_number,
                              double* width,
                              double* height) override;
 };
 
 }  // namespace chrome_pdf
 
 #endif  // PDF_PDFIUM_PDFIUM_ENGINE_H_