Use actual type instead CFX_Deletable

core/fpdfapi/rendercontext.cpp

+// 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
+
+#include "core/fpdfapi/include/rendercontext.h"
+
+#include "core/fpdfapi/fpdf_render/include/cpdf_progressiverenderer.h"

[Lei Zhang, 2016/07/22 22:49:16]

Do we need all these includes?

[Wei Li, 2016/07/23 03:01:13]

Yes, since I only use forward declaration in the header file.
The constructor/destructor needs the class definitions for all member variables
from these includes.

+#include "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h"
+#include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h"
+#include "core/fpdfdoc/cpdf_annotlist.h"
+#include "core/fpdfdoc/include/fpdf_doc.h"
+#include "core/fxge/include/fx_ge.h"
+
+CRenderContext::CRenderContext() {}
+
+CRenderContext::~CRenderContext() {
+  delete m_pOptions->m_pOCContext;

[Lei Zhang, 2016/07/22 22:49:16]

A bit worried here because CRenderContext doesn't initialize |m_pOptions|. If we
create a CRenderContext and delete it, this crashes.

[Wei Li, 2016/07/23 03:01:13]

The use of |m_pOCContext| is a bit messy.
Added a check.

+}