3 files changed, 27 insertions, 43 deletions
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index 89c3e739a7..fe221c9d7d 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -31,7 +31,7 @@
    ((uint32_t)rgb & 0x0000FF00) | (((uint32_t)rgb & 0x00FF0000) >> 16))
 
 typedef unsigned int FX_UINT;
-class CRenderContext;
+class CPDF_PageRenderContext;
 class IFSDK_PAUSE_Adapter;
 
 class CPDF_CustomAccess final : public IFX_FileRead {
@@ -112,7 +112,7 @@ CFX_DIBitmap* CFXBitmapFromFPDFBitmap(FPDF_BITMAP bitmap);
 
 void FSDK_SetSandBoxPolicy(FPDF_DWORD policy, FPDF_BOOL enable);
 FPDF_BOOL FSDK_IsSandBoxPolicyEnabled(FPDF_DWORD policy);
-void FPDF_RenderPage_Retail(CRenderContext* pContext,
+void FPDF_RenderPage_Retail(CPDF_PageRenderContext* pContext,
                             FPDF_PAGE page,
                             int start_x,
                             int start_y,
diff --git a/fpdfsdk/include/fsdk_pauseadapter.h b/fpdfsdk/include/fsdk_pauseadapter.h
new file mode 100644
index 0000000000..793e8f2772
--- /dev/null
+++ b/fpdfsdk/include/fsdk_pauseadapter.h
@@ -0,0 +1,25 @@
+// Copyright 2016 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 FPDFSDK_INCLUDE_FSDK_PAUSEADAPTER_H_
+#define FPDFSDK_INCLUDE_FSDK_PAUSEADAPTER_H_
+
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_system.h"
+#include "public/fpdf_progressive.h"
+
+class IFSDK_PAUSE_Adapter : public IFX_Pause {
+ public:
+  explicit IFSDK_PAUSE_Adapter(IFSDK_PAUSE* IPause);
+  ~IFSDK_PAUSE_Adapter() override;
+
+  FX_BOOL NeedToPauseNow() override;
+
+ private:
+  IFSDK_PAUSE* const m_IPause;
+};
+
+#endif  // FPDFSDK_INCLUDE_FSDK_PAUSEADAPTER_H_
diff --git a/fpdfsdk/include/fsdk_rendercontext.h b/fpdfsdk/include/fsdk_rendercontext.h
deleted file mode 100644
index c2ae45eef5..0000000000
--- a/fpdfsdk/include/fsdk_rendercontext.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// 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 FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_
-#define FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_
-
-#include "core/fpdfapi/fpdf_render/include/cpdf_progressiverenderer.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "fpdfsdk/include/fsdk_define.h"
-#include "public/fpdf_progressive.h"
-
-// Everything about rendering is put here: for OOM recovery
-class CRenderContext : public CFX_Deletable {
- public:
-  CRenderContext() { Clear(); }
-  ~CRenderContext() override;
-
-  void Clear();
-
-  CFX_RenderDevice* m_pDevice;
-  CPDF_RenderContext* m_pContext;
-  CPDF_ProgressiveRenderer* m_pRenderer;
-  CPDF_AnnotList* m_pAnnots;
-  CPDF_RenderOptions* m_pOptions;
-};
-
-class IFSDK_PAUSE_Adapter : public IFX_Pause {
- public:
-  explicit IFSDK_PAUSE_Adapter(IFSDK_PAUSE* IPause);
-  ~IFSDK_PAUSE_Adapter() override;
-
-  FX_BOOL NeedToPauseNow() override;
-
- private:
-  IFSDK_PAUSE* m_IPause;
-};
-
-#endif  // FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_