Rework progressive render loop.

core/include/fpdfapi/fpdf_render.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
 
 #include <map>
@@ skipping 118 matching lines @@
   static int ToFPDFStatus(Status status) { return static_cast<int>(status); }
 
   CPDF_ProgressiveRenderer(CPDF_RenderContext* pContext,
                            CFX_RenderDevice* pDevice,
                            const CPDF_RenderOptions* pOptions);
   ~CPDF_ProgressiveRenderer();
 
   Status GetStatus() const { return m_Status; }
   void Start(IFX_Pause* pPause);
   void Continue(IFX_Pause* pPause);
-  int EstimateProgress();
 
  private:
   void RenderStep();
 
+  // Maximum page objects to render before checking for pause.
+  static const int kStepLimit = 100;
+
   Status m_Status;
   CPDF_RenderContext* const m_pContext;
   CFX_RenderDevice* const m_pDevice;
   const CPDF_RenderOptions* const m_pOptions;
   std::unique_ptr<CPDF_RenderStatus> m_pRenderStatus;
   CFX_FloatRect m_ClipRect;
   FX_DWORD m_LayerIndex;
-  FX_DWORD m_ObjectIndex;
-  FX_POSITION m_ObjectPos;
-  FX_POSITION m_PrevLastPos;
+  CPDF_RenderContext::Layer* m_pCurrentLayer;
+  FX_POSITION m_LastObjectRendered;
 };
 
 class CPDF_TextRenderer {
  public:
   static void DrawTextString(CFX_RenderDevice* pDevice,
                              int left,
                              int top,
                              CPDF_Font* pFont,
                              int height,
                              const CFX_ByteString& str,
@@ skipping 90 matching lines @@
 
  protected:
   friend class CPDF_Page;
   CPDF_Page* const m_pPage;
   CPDF_ImageCacheEntry* m_pCurImageCacheEntry;
   std::map<CPDF_Stream*, CPDF_ImageCacheEntry*> m_ImageCache;
   FX_DWORD m_nTimeCount;
   FX_DWORD m_nCacheSize;
   FX_BOOL m_bCurFindCache;
 };
-class CPDF_RenderConfig {
- public:
-  CPDF_RenderConfig();
-  ~CPDF_RenderConfig();
-  int m_HalftoneLimit;
-  int m_RenderStepLimit;
-};
 
 FX_BOOL IsAvailableMatrix(const CFX_Matrix& matrix);
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_