Move CPDF_Document code into cpdf_document.cpp.

Review URL: https://codereview.chromium.org/1925453002

9 files changed, 1244 insertions, 1318 deletions

diff --git a/BUILD.gn b/BUILD.gn
index ca4dfec0ff..0ef7291085 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -307,7 +307,6 @@ static_library("fpdfapi") {
     "core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp",
     "core/fpdfapi/fpdf_edit/editint.h",
     "core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp",
-    "core/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp",
     "core/fpdfapi/fpdf_edit/include/cpdf_creator.h",
     "core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h",
     "core/fpdfapi/fpdf_font/cpdf_cidfont.cpp",
diff --git a/core/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp b/core/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp
deleted file mode 100644
index 843c8f884b..0000000000
--- a/core/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp
+++ /dev/null
@@ -1,1126 +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
-
-#include <limits.h>
-
-#include <set>
-#include <vector>
-
-#include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
-#include "core/fpdfapi/fpdf_font/include/cpdf_fontencoding.h"
-#include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
-#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
-#include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
-#include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
-#include "core/fpdfapi/fpdf_parser/include/cpdf_reference.h"
-#include "core/fpdfapi/fpdf_render/render_int.h"
-#include "core/fpdfapi/include/cpdf_modulemgr.h"
-#include "third_party/base/stl_util.h"
-
-CPDF_Document::CPDF_Document()
-    : CPDF_IndirectObjectHolder(nullptr),
-      m_pRootDict(nullptr),
-      m_pInfoDict(nullptr),
-      m_bLinearized(FALSE),
-      m_dwFirstPageNo(0),
-      m_dwFirstPageObjNum(0),
-      m_pDocPage(new CPDF_DocPageData(this)),
-      m_pDocRender(new CPDF_DocRenderData(this)) {}
-
-void CPDF_Document::CreateNewDoc() {
-  ASSERT(!m_pRootDict && !m_pInfoDict);
-
-  m_pRootDict = new CPDF_Dictionary;
-  m_pRootDict->SetAtName("Type", "Catalog");
-  int objnum = AddIndirectObject(m_pRootDict);
-
-  CPDF_Dictionary* pPages = new CPDF_Dictionary;
-  pPages->SetAtName("Type", "Pages");
-  pPages->SetAtNumber("Count", 0);
-  pPages->SetAt("Kids", new CPDF_Array);
-  objnum = AddIndirectObject(pPages);
-  m_pRootDict->SetAtReference("Pages", this, objnum);
-
-  m_pInfoDict = new CPDF_Dictionary;
-  AddIndirectObject(m_pInfoDict);
-}
-
-static const uint16_t g_FX_CP874Unicodes[128] = {
-    0x20AC, 0x0000, 0x0000, 0x0000, 0x0000, 0x2026, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2018,
-    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00A0, 0x0E01, 0x0E02, 0x0E03,
-    0x0E04, 0x0E05, 0x0E06, 0x0E07, 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C,
-    0x0E0D, 0x0E0E, 0x0E0F, 0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15,
-    0x0E16, 0x0E17, 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E,
-    0x0E1F, 0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
-    0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F, 0x0E30,
-    0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, 0x0E38, 0x0E39,
-    0x0E3A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0E3F, 0x0E40, 0x0E41, 0x0E42,
-    0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, 0x0E48, 0x0E49, 0x0E4A, 0x0E4B,
-    0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F, 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54,
-    0x0E55, 0x0E56, 0x0E57, 0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0x0000, 0x0000,
-    0x0000, 0x0000,
-};
-static const uint16_t g_FX_CP1250Unicodes[128] = {
-    0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021, 0x0000,
-    0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179, 0x0000, 0x2018,
-    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x0000, 0x2122, 0x0161,
-    0x203A, 0x015B, 0x0165, 0x017E, 0x017A, 0x00A0, 0x02C7, 0x02D8, 0x0141,
-    0x00A4, 0x0104, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC,
-    0x00AD, 0x00AE, 0x017B, 0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5,
-    0x00B6, 0x00B7, 0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E,
-    0x017C, 0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
-    0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E, 0x0110,
-    0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7, 0x0158, 0x016E,
-    0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF, 0x0155, 0x00E1, 0x00E2,
-    0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, 0x010D, 0x00E9, 0x0119, 0x00EB,
-    0x011B, 0x00ED, 0x00EE, 0x010F, 0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4,
-    0x0151, 0x00F6, 0x00F7, 0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD,
-    0x0163, 0x02D9,
-};
-static const uint16_t g_FX_CP1251Unicodes[128] = {
-    0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021, 0x20AC,
-    0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F, 0x0452, 0x2018,
-    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x0000, 0x2122, 0x0459,
-    0x203A, 0x045A, 0x045C, 0x045B, 0x045F, 0x00A0, 0x040E, 0x045E, 0x0408,
-    0x00A4, 0x0490, 0x00A6, 0x00A7, 0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC,
-    0x00AD, 0x00AE, 0x0407, 0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5,
-    0x00B6, 0x00B7, 0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455,
-    0x0457, 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
-    0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420,
-    0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429,
-    0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 0x0430, 0x0431, 0x0432,
-    0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B,
-    0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444,
-    0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D,
-    0x044E, 0x044F,
-};
-static const uint16_t g_FX_CP1253Unicodes[128] = {
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x0000,
-    0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2018,
-    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x0000, 0x2122, 0x0000,
-    0x203A, 0x0000, 0x0000, 0x0000, 0x0000, 0x00A0, 0x0385, 0x0386, 0x00A3,
-    0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x0000, 0x00AB, 0x00AC,
-    0x00AD, 0x00AE, 0x2015, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5,
-    0x00B6, 0x00B7, 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E,
-    0x038F, 0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
-    0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0,
-    0x03A1, 0x0000, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9,
-    0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF, 0x03B0, 0x03B1, 0x03B2,
-    0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB,
-    0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4,
-    0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD,
-    0x03CE, 0x0000,
-};
-static const uint16_t g_FX_CP1254Unicodes[128] = {
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6,
-    0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000, 0x0000, 0x2018,
-    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x02DC, 0x2122, 0x0161,
-    0x203A, 0x0153, 0x0000, 0x0000, 0x0178, 0x00A0, 0x00A1, 0x00A2, 0x00A3,
-    0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC,
-    0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5,
-    0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE,
-    0x00BF, 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x011E,
-    0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9,
-    0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF, 0x00E0, 0x00E1, 0x00E2,
-    0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB,
-    0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4,
-    0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131,
-    0x015F, 0x00FF,
-};
-static const uint16_t g_FX_CP1255Unicodes[128] = {
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6,
-    0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2018,
-    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x02DC, 0x2122, 0x0000,
-    0x203A, 0x0000, 0x0000, 0x0000, 0x0000, 0x00A0, 0x00A1, 0x00A2, 0x00A3,
-    0x20AA, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC,
-    0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5,
-    0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE,
-    0x00BF, 0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7,
-    0x05B8, 0x05B9, 0x0000, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF, 0x05C0,
-    0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3, 0x05F4, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x05D0, 0x05D1, 0x05D2,
-    0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB,
-    0x05DC, 0x05DD, 0x05DE, 0x05DF, 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4,
-    0x05E5, 0x05E6, 0x05E7, 0x05E8, 0x05E9, 0x05EA, 0x0000, 0x0000, 0x200E,
-    0x200F, 0x0000,
-};
-static const uint16_t g_FX_CP1256Unicodes[128] = {
-    0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6,
-    0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688, 0x06AF, 0x2018,
-    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x06A9, 0x2122, 0x0691,
-    0x203A, 0x0153, 0x200C, 0x200D, 0x06BA, 0x00A0, 0x060C, 0x00A2, 0x00A3,
-    0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC,
-    0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5,
-    0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE,
-    0x061F, 0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
-    0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, 0x0630,
-    0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7, 0x0637, 0x0638,
-    0x0639, 0x063A, 0x0640, 0x0641, 0x0642, 0x0643, 0x00E0, 0x0644, 0x00E2,
-    0x0645, 0x0646, 0x0647, 0x0648, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB,
-    0x0649, 0x064A, 0x00EE, 0x00EF, 0x064B, 0x064C, 0x064D, 0x064E, 0x00F4,
-    0x064F, 0x0650, 0x00F7, 0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E,
-    0x200F, 0x06D2,
-};
-static const uint16_t g_FX_CP1257Unicodes[128] = {
-    0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021, 0x0000,
-    0x2030, 0x0000, 0x2039, 0x0000, 0x00A8, 0x02C7, 0x00B8, 0x0000, 0x2018,
-    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x0000, 0x2122, 0x0000,
-    0x203A, 0x0000, 0x00AF, 0x02DB, 0x0000, 0x00A0, 0x0000, 0x00A2, 0x00A3,
-    0x00A4, 0x0000, 0x00A6, 0x00A7, 0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC,
-    0x00AD, 0x00AE, 0x00C6, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5,
-    0x00B6, 0x00B7, 0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE,
-    0x00E6, 0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
-    0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B, 0x0160,
-    0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, 0x0172, 0x0141,
-    0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF, 0x0105, 0x012F, 0x0101,
-    0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, 0x010D, 0x00E9, 0x017A, 0x0117,
-    0x0123, 0x0137, 0x012B, 0x013C, 0x0161, 0x0144, 0x0146, 0x00F3, 0x014D,
-    0x00F5, 0x00F6, 0x00F7, 0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C,
-    0x017E, 0x02D9,
-};
-
-struct FX_CharsetUnicodes {
-  uint8_t m_Charset;
-  const uint16_t* m_pUnicodes;
-};
-
-const FX_CharsetUnicodes g_FX_CharsetUnicodes[] = {
-    {FXFONT_THAI_CHARSET, g_FX_CP874Unicodes},
-    {FXFONT_EASTEUROPE_CHARSET, g_FX_CP1250Unicodes},
-    {FXFONT_RUSSIAN_CHARSET, g_FX_CP1251Unicodes},
-    {FXFONT_GREEK_CHARSET, g_FX_CP1253Unicodes},
-    {FXFONT_TURKISH_CHARSET, g_FX_CP1254Unicodes},
-    {FXFONT_HEBREW_CHARSET, g_FX_CP1255Unicodes},
-    {FXFONT_ARABIC_CHARSET, g_FX_CP1256Unicodes},
-    {FXFONT_BALTIC_CHARSET, g_FX_CP1257Unicodes},
-};
-
-#if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_)
-static void _InsertWidthArray(HDC hDC,
-                              int start,
-                              int end,
-                              CPDF_Array* pWidthArray) {
-  int size = end - start + 1;
-  int* widths = FX_Alloc(int, size);
-  GetCharWidth(hDC, start, end, widths);
-  int i;
-  for (i = 1; i < size; i++)
-    if (widths[i] != *widths) {
-      break;
-    }
-  if (i == size) {
-    int first = pWidthArray->GetIntegerAt(pWidthArray->GetCount() - 1);
-    pWidthArray->AddInteger(first + size - 1);
-    pWidthArray->AddInteger(*widths);
-  } else {
-    CPDF_Array* pWidthArray1 = new CPDF_Array;
-    pWidthArray->Add(pWidthArray1);
-    for (i = 0; i < size; i++) {
-      pWidthArray1->AddInteger(widths[i]);
-    }
-  }
-  FX_Free(widths);
-}
-CPDF_Font* CPDF_Document::AddWindowsFont(LOGFONTW* pLogFont,
-                                         FX_BOOL bVert,
-                                         FX_BOOL bTranslateName) {
-  LOGFONTA lfa;
-  FXSYS_memcpy(&lfa, pLogFont, (char*)lfa.lfFaceName - (char*)&lfa);
-  CFX_ByteString face = CFX_ByteString::FromUnicode(pLogFont->lfFaceName);
-  if (face.GetLength() >= LF_FACESIZE) {
-    return NULL;
-  }
-  FXSYS_strcpy(lfa.lfFaceName, face.c_str());
-  return AddWindowsFont(&lfa, bVert, bTranslateName);
-}
-CFX_ByteString _FPDF_GetPSNameFromTT(HDC hDC) {
-  CFX_ByteString result;
-  DWORD size = ::GetFontData(hDC, 'eman', 0, NULL, 0);
-  if (size != GDI_ERROR) {
-    LPBYTE buffer = FX_Alloc(BYTE, size);
-    ::GetFontData(hDC, 'eman', 0, buffer, size);
-    result = GetNameFromTT(buffer, size, 6);
-    FX_Free(buffer);
-  }
-  return result;
-}
-CPDF_Font* CPDF_Document::AddWindowsFont(LOGFONTA* pLogFont,
-                                         FX_BOOL bVert,
-                                         FX_BOOL bTranslateName) {
-  pLogFont->lfHeight = -1000;
-  pLogFont->lfWidth = 0;
-  HGDIOBJ hFont = CreateFontIndirectA(pLogFont);
-  HDC hDC = CreateCompatibleDC(NULL);
-  hFont = SelectObject(hDC, hFont);
-  int tm_size = GetOutlineTextMetrics(hDC, 0, NULL);
-  if (tm_size == 0) {
-    hFont = SelectObject(hDC, hFont);
-    DeleteObject(hFont);
-    DeleteDC(hDC);
-    return NULL;
-  }
-  LPBYTE tm_buf = FX_Alloc(BYTE, tm_size);
-  OUTLINETEXTMETRIC* ptm = (OUTLINETEXTMETRIC*)tm_buf;
-  GetOutlineTextMetrics(hDC, tm_size, ptm);
-  int flags = 0, italicangle, ascend, descend, capheight, bbox[4];
-  if (pLogFont->lfItalic) {
-    flags |= PDFFONT_ITALIC;
-  }
-  if ((pLogFont->lfPitchAndFamily & 3) == FIXED_PITCH) {
-    flags |= PDFFONT_FIXEDPITCH;
-  }
-  if ((pLogFont->lfPitchAndFamily & 0xf8) == FF_ROMAN) {
-    flags |= PDFFONT_SERIF;
-  }
-  if ((pLogFont->lfPitchAndFamily & 0xf8) == FF_SCRIPT) {
-    flags |= PDFFONT_SCRIPT;
-  }
-  bool bCJK = pLogFont->lfCharSet == CHINESEBIG5_CHARSET ||
-              pLogFont->lfCharSet == GB2312_CHARSET ||
-              pLogFont->lfCharSet == HANGEUL_CHARSET ||
-              pLogFont->lfCharSet == SHIFTJIS_CHARSET;
-  CFX_ByteString basefont;
-  if (bTranslateName && bCJK) {
-    basefont = _FPDF_GetPSNameFromTT(hDC);
-  }
-  if (basefont.IsEmpty()) {
-    basefont = pLogFont->lfFaceName;
-  }
-  italicangle = ptm->otmItalicAngle / 10;
-  ascend = ptm->otmrcFontBox.top;
-  descend = ptm->otmrcFontBox.bottom;
-  capheight = ptm->otmsCapEmHeight;
-  bbox[0] = ptm->otmrcFontBox.left;
-  bbox[1] = ptm->otmrcFontBox.bottom;
-  bbox[2] = ptm->otmrcFontBox.right;
-  bbox[3] = ptm->otmrcFontBox.top;
-  FX_Free(tm_buf);
-  basefont.Replace(" ", "");
-  CPDF_Dictionary* pBaseDict = new CPDF_Dictionary;
-  pBaseDict->SetAtName("Type", "Font");
-  CPDF_Dictionary* pFontDict = pBaseDict;
-  if (!bCJK) {
-    if (pLogFont->lfCharSet == ANSI_CHARSET ||
-        pLogFont->lfCharSet == DEFAULT_CHARSET ||
-        pLogFont->lfCharSet == SYMBOL_CHARSET) {
-      if (pLogFont->lfCharSet == SYMBOL_CHARSET) {
-        flags |= PDFFONT_SYMBOLIC;
-      } else {
-        flags |= PDFFONT_NONSYMBOLIC;
-      }
-      pBaseDict->SetAtName("Encoding", "WinAnsiEncoding");
-    } else {
-      flags |= PDFFONT_NONSYMBOLIC;
-      int i;
-      for (i = 0; i < sizeof g_FX_CharsetUnicodes / sizeof(FX_CharsetUnicodes);
-           i++)
-        if (g_FX_CharsetUnicodes[i].m_Charset == pLogFont->lfCharSet) {
-          break;
-        }
-      if (i < sizeof g_FX_CharsetUnicodes / sizeof(FX_CharsetUnicodes)) {
-        CPDF_Dictionary* pEncoding = new CPDF_Dictionary;
-        pEncoding->SetAtName("BaseEncoding", "WinAnsiEncoding");
-        CPDF_Array* pArray = new CPDF_Array;
-        pArray->AddInteger(128);
-        const uint16_t* pUnicodes = g_FX_CharsetUnicodes[i].m_pUnicodes;
-        for (int j = 0; j < 128; j++) {
-          CFX_ByteString name = PDF_AdobeNameFromUnicode(pUnicodes[j]);
-          if (name.IsEmpty()) {
-            pArray->AddName(".notdef");
-          } else {
-            pArray->AddName(name);
-          }
-        }
-        pEncoding->SetAt("Differences", pArray);
-        AddIndirectObject(pEncoding);
-        pBaseDict->SetAtReference("Encoding", this, pEncoding);
-      }
-    }
-    if (pLogFont->lfWeight > FW_MEDIUM && pLogFont->lfItalic) {
-      basefont += ",BoldItalic";
-    } else if (pLogFont->lfWeight > FW_MEDIUM) {
-      basefont += ",Bold";
-    } else if (pLogFont->lfItalic) {
-      basefont += ",Italic";
-    }
-    pBaseDict->SetAtName("Subtype", "TrueType");
-    pBaseDict->SetAtName("BaseFont", basefont);
-    pBaseDict->SetAtNumber("FirstChar", 32);
-    pBaseDict->SetAtNumber("LastChar", 255);
-    int char_widths[224];
-    GetCharWidth(hDC, 32, 255, char_widths);
-    CPDF_Array* pWidths = new CPDF_Array;
-    for (int i = 0; i < 224; i++) {
-      pWidths->AddInteger(char_widths[i]);
-    }
-    pBaseDict->SetAt("Widths", pWidths);
-  } else {
-    flags |= PDFFONT_NONSYMBOLIC;
-    pFontDict = new CPDF_Dictionary;
-    CFX_ByteString cmap;
-    CFX_ByteString ordering;
-    int supplement = 0;
-    CPDF_Array* pWidthArray = new CPDF_Array;
-    switch (pLogFont->lfCharSet) {
-      case CHINESEBIG5_CHARSET:
-        cmap = bVert ? "ETenms-B5-V" : "ETenms-B5-H";
-        ordering = "CNS1";
-        supplement = 4;
-        pWidthArray->AddInteger(1);
-        _InsertWidthArray(hDC, 0x20, 0x7e, pWidthArray);
-        break;
-      case GB2312_CHARSET:
-        cmap = bVert ? "GBK-EUC-V" : "GBK-EUC-H";
-        ordering = "GB1", supplement = 2;
-        pWidthArray->AddInteger(7716);
-        _InsertWidthArray(hDC, 0x20, 0x20, pWidthArray);
-        pWidthArray->AddInteger(814);
-        _InsertWidthArray(hDC, 0x21, 0x7e, pWidthArray);
-        break;
-      case HANGEUL_CHARSET:
-        cmap = bVert ? "KSCms-UHC-V" : "KSCms-UHC-H";
-        ordering = "Korea1";
-        supplement = 2;
-        pWidthArray->AddInteger(1);
-        _InsertWidthArray(hDC, 0x20, 0x7e, pWidthArray);
-        break;
-      case SHIFTJIS_CHARSET:
-        cmap = bVert ? "90ms-RKSJ-V" : "90ms-RKSJ-H";
-        ordering = "Japan1";
-        supplement = 5;
-        pWidthArray->AddInteger(231);
-        _InsertWidthArray(hDC, 0x20, 0x7d, pWidthArray);
-        pWidthArray->AddInteger(326);
-        _InsertWidthArray(hDC, 0xa0, 0xa0, pWidthArray);
-        pWidthArray->AddInteger(327);
-        _InsertWidthArray(hDC, 0xa1, 0xdf, pWidthArray);
-        pWidthArray->AddInteger(631);
-        _InsertWidthArray(hDC, 0x7e, 0x7e, pWidthArray);
-        break;
-    }
-    pBaseDict->SetAtName("Subtype", "Type0");
-    pBaseDict->SetAtName("BaseFont", basefont);
-    pBaseDict->SetAtName("Encoding", cmap);
-    pFontDict->SetAt("W", pWidthArray);
-    pFontDict->SetAtName("Type", "Font");
-    pFontDict->SetAtName("Subtype", "CIDFontType2");
-    pFontDict->SetAtName("BaseFont", basefont);
-    CPDF_Dictionary* pCIDSysInfo = new CPDF_Dictionary;
-    pCIDSysInfo->SetAtString("Registry", "Adobe");
-    pCIDSysInfo->SetAtString("Ordering", ordering);
-    pCIDSysInfo->SetAtInteger("Supplement", supplement);
-    pFontDict->SetAt("CIDSystemInfo", pCIDSysInfo);
-    CPDF_Array* pArray = new CPDF_Array;
-    pBaseDict->SetAt("DescendantFonts", pArray);
-    AddIndirectObject(pFontDict);
-    pArray->AddReference(this, pFontDict);
-  }
-  AddIndirectObject(pBaseDict);
-  CPDF_Dictionary* pFontDesc = new CPDF_Dictionary;
-  pFontDesc->SetAtName("Type", "FontDescriptor");
-  pFontDesc->SetAtName("FontName", basefont);
-  pFontDesc->SetAtInteger("Flags", flags);
-  CPDF_Array* pBBox = new CPDF_Array;
-  for (int i = 0; i < 4; i++) {
-    pBBox->AddInteger(bbox[i]);
-  }
-  pFontDesc->SetAt("FontBBox", pBBox);
-  pFontDesc->SetAtInteger("ItalicAngle", italicangle);
-  pFontDesc->SetAtInteger("Ascent", ascend);
-  pFontDesc->SetAtInteger("Descent", descend);
-  pFontDesc->SetAtInteger("CapHeight", capheight);
-  pFontDesc->SetAtInteger("StemV", pLogFont->lfWeight / 5);
-  AddIndirectObject(pFontDesc);
-  pFontDict->SetAtReference("FontDescriptor", this, pFontDesc);
-  hFont = SelectObject(hDC, hFont);
-  DeleteObject(hFont);
-  DeleteDC(hDC);
-  return LoadFont(pBaseDict);
-}
-#endif
-
-#if (_FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_)
-uint32_t FX_GetLangHashCode(const FX_CHAR* pStr) {
-  FXSYS_assert(pStr);
-  int32_t iLength = FXSYS_strlen(pStr);
-  const FX_CHAR* pStrEnd = pStr + iLength;
-  uint32_t uHashCode = 0;
-  while (pStr < pStrEnd) {
-    uHashCode = 31 * uHashCode + tolower(*pStr++);
-  }
-  return uHashCode;
-}
-struct FX_LANG2CS {
-  uint32_t uLang;
-  int uCharset;
-} * FX_LPLANG2CS;
-static const FX_LANG2CS gs_FXLang2CharsetTable[] = {
-    {3109, 0},         {3121, 178}, {3129, 162}, {3139, 204}, {3141, 204},
-    {3166, 0},         {3184, 238}, {3197, 0},   {3201, 0},   {3239, 161},
-    {3241, 0},         {3246, 0},   {3247, 186}, {3248, 0},   {3259, 178},
-    {3267, 0},         {3273, 0},   {3276, 0},   {3301, 0},   {3310, 1},
-    {3325, 177},       {3329, 1},   {3338, 238}, {3341, 238}, {3345, 1},
-    {3355, 0},         {3370, 0},   {3371, 0},   {3383, 128}, {3424, 204},
-    {3427, 1},         {3428, 129}, {3436, 178}, {3464, 186}, {3466, 186},
-    {3486, 204},       {3487, 0},   {3493, 1},   {3494, 0},   {3508, 0},
-    {3518, 0},         {3520, 0},   {3569, 1},   {3580, 238}, {3588, 0},
-    {3645, 238},       {3651, 204}, {3672, 238}, {3673, 238}, {3678, 238},
-    {3679, 238},       {3683, 0},   {3684, 0},   {3693, 1},   {3697, 1},
-    {3700, 222},       {3710, 162}, {3734, 204}, {3741, 178}, {3749, 162},
-    {3763, 163},       {3886, 134}, {105943, 0}, {106375, 1}, {3923451837, 134},
-    {3923451838, 136},
-};
-static uint16_t FX_GetCsFromLangCode(uint32_t uCode) {
-  int32_t iStart = 0;
-  int32_t iEnd = sizeof(gs_FXLang2CharsetTable) / sizeof(FX_LANG2CS) - 1;
-  while (iStart <= iEnd) {
-    int32_t iMid = (iStart + iEnd) / 2;
-    const FX_LANG2CS& charset = gs_FXLang2CharsetTable[iMid];
-    if (uCode == charset.uLang) {
-      return charset.uCharset;
-    }
-    if (uCode < charset.uLang) {
-      iEnd = iMid - 1;
-    } else {
-      iStart = iMid + 1;
-    }
-  }
-  return 0;
-}
-static uint16_t FX_GetCharsetFromLang(const FX_CHAR* pLang, int32_t iLength) {
-  FXSYS_assert(pLang);
-  if (iLength < 0) {
-    iLength = FXSYS_strlen(pLang);
-  }
-  uint32_t uHash = FX_GetLangHashCode(pLang);
-  return FX_GetCsFromLangCode(uHash);
-}
-static void _CFString2CFXByteString(CFStringRef src, CFX_ByteString& dest) {
-  SInt32 len = CFStringGetLength(src);
-  CFRange range = CFRangeMake(0, len);
-  CFIndex used = 0;
-  UInt8* pBuffer = (UInt8*)calloc(len + 1, sizeof(UInt8));
-  CFStringGetBytes(src, range, kCFStringEncodingASCII, 0, false, pBuffer, len,
-                   &used);
-  dest = (FX_CHAR*)pBuffer;
-  free(pBuffer);
-}
-static bool IsHasCharSet(CFArrayRef languages,
-                         const std::vector<uint32_t>& charSets) {
-  for (int i = 0; i < CFArrayGetCount(languages); ++i) {
-    CFStringRef language = (CFStringRef)CFArrayGetValueAtIndex(languages, i);
-    uint32_t CharSet = FX_GetCharsetFromLang(
-        CFStringGetCStringPtr(language, kCFStringEncodingMacRoman), -1);
-    if (pdfium::ContainsValue(charSets, CharSet))
-      return true;
-  }
-  return false;
-}
-void FX_GetCharWidth(CTFontRef font, UniChar start, UniChar end, int* width) {
-  CGFloat size = CTFontGetSize(font);
-  for (; start <= end; ++start) {
-    CGGlyph pGlyph = 0;
-    CFIndex count = 1;
-    CTFontGetGlyphsForCharacters(font, &start, &pGlyph, count);
-    CGSize advances;
-    CTFontGetAdvancesForGlyphs(font, kCTFontDefaultOrientation, &pGlyph,
-                               &advances, 1);
-    *width = (int)(advances.width / size * 1000);
-    width++;
-  }
-}
-static void _InsertWidthArray(CTFontRef font,
-                              int start,
-                              int end,
-                              CPDF_Array* pWidthArray) {
-  int size = end - start + 1;
-  int* widths = FX_Alloc(int, size);
-  FX_GetCharWidth(font, start, end, widths);
-  int i;
-  for (i = 1; i < size; i++)
-    if (widths[i] != *widths) {
-      break;
-    }
-  if (i == size) {
-    int first = pWidthArray->GetIntegerAt(pWidthArray->GetCount() - 1);
-    pWidthArray->AddInteger(first + size - 1);
-    pWidthArray->AddInteger(*widths);
-  } else {
-    CPDF_Array* pWidthArray1 = new CPDF_Array;
-    pWidthArray->Add(pWidthArray1);
-    for (i = 0; i < size; i++) {
-      pWidthArray1->AddInteger(widths[i]);
-    }
-  }
-  FX_Free(widths);
-}
-CPDF_Font* CPDF_Document::AddMacFont(CTFontRef pFont,
-                                     FX_BOOL bVert,
-                                     FX_BOOL bTranslateName) {
-  CTFontRef font = (CTFontRef)pFont;
-  CTFontDescriptorRef descriptor = CTFontCopyFontDescriptor(font);
-  if (!descriptor) {
-    return NULL;
-  }
-  CFX_ByteString basefont;
-  int flags = 0, italicangle = 0, ascend = 0, descend = 0, capheight = 0,
-      bbox[4];
-  FXSYS_memset(bbox, 0, sizeof(int) * 4);
-  CFArrayRef languages = (CFArrayRef)CTFontDescriptorCopyAttribute(
-      descriptor, kCTFontLanguagesAttribute);
-  if (!languages) {
-    CFRelease(descriptor);
-    return NULL;
-  }
-
-  bool bCJK = IsHasCharSet(languages,
-                           {FXFONT_CHINESEBIG5_CHARSET, FXFONT_GB2312_CHARSET,
-                            FXFONT_HANGEUL_CHARSET, FXFONT_SHIFTJIS_CHARSET});
-  CFRelease(descriptor);
-  CFDictionaryRef traits = (CFDictionaryRef)CTFontCopyTraits(font);
-  if (!traits) {
-    CFRelease(languages);
-    return NULL;
-  }
-  CFNumberRef sybolicTrait =
-      (CFNumberRef)CFDictionaryGetValue(traits, kCTFontSymbolicTrait);
-  CTFontSymbolicTraits trait = 0;
-  CFNumberGetValue(sybolicTrait, kCFNumberSInt32Type, &trait);
-  if (trait & kCTFontItalicTrait) {
-    flags |= PDFFONT_ITALIC;
-  }
-  if (trait & kCTFontMonoSpaceTrait) {
-    flags |= PDFFONT_FIXEDPITCH;
-  }
-  if (trait & kCTFontModernSerifsClass) {
-    flags |= PDFFONT_SERIF;
-  }
-  if (trait & kCTFontScriptsClass) {
-    flags |= PDFFONT_SCRIPT;
-  }
-  CFNumberRef weightTrait =
-      (CFNumberRef)CFDictionaryGetValue(traits, kCTFontWeightTrait);
-  Float32 weight = 0;
-  CFNumberGetValue(weightTrait, kCFNumberFloat32Type, &weight);
-  italicangle = CTFontGetSlantAngle(font);
-  ascend = CTFontGetAscent(font);
-  descend = CTFontGetDescent(font);
-  capheight = CTFontGetCapHeight(font);
-  CGRect box = CTFontGetBoundingBox(font);
-  bbox[0] = box.origin.x;
-  bbox[1] = box.origin.y;
-  bbox[2] = box.origin.x + box.size.width;
-  bbox[3] = box.origin.y + box.size.height;
-  if (bTranslateName && bCJK) {
-    CFStringRef postName = CTFontCopyPostScriptName(font);
-    _CFString2CFXByteString(postName, basefont);
-    CFRelease(postName);
-  }
-  if (basefont.IsEmpty()) {
-    CFStringRef fullName = CTFontCopyFullName(font);
-    _CFString2CFXByteString(fullName, basefont);
-    CFRelease(fullName);
-  }
-  basefont.Replace(" ", "");
-  CPDF_Dictionary* pBaseDict = new CPDF_Dictionary;
-  CPDF_Dictionary* pFontDict = pBaseDict;
-  if (!bCJK) {
-    if (IsHasCharSet(languages, {FXFONT_ANSI_CHARSET, FXFONT_DEFAULT_CHARSET,
-                                 FXFONT_SYMBOL_CHARSET})) {
-      if (IsHasCharSet(languages, {FXFONT_SYMBOL_CHARSET})) {
-        flags |= PDFFONT_SYMBOLIC;
-      } else {
-        flags |= PDFFONT_NONSYMBOLIC;
-      }
-      pBaseDict->SetAtName("Encoding", "WinAnsiEncoding");
-    } else {
-      flags |= PDFFONT_NONSYMBOLIC;
-      size_t i;
-      for (i = 0; i < FX_ArraySize(g_FX_CharsetUnicodes); ++i) {
-        if (IsHasCharSet(languages, {g_FX_CharsetUnicodes[i].m_Charset}))
-          break;
-      }
-      if (i < FX_ArraySize(g_FX_CharsetUnicodes)) {
-        CPDF_Dictionary* pEncoding = new CPDF_Dictionary;
-        pEncoding->SetAtName("BaseEncoding", "WinAnsiEncoding");
-        CPDF_Array* pArray = new CPDF_Array;
-        pArray->AddInteger(128);
-        const uint16_t* pUnicodes = g_FX_CharsetUnicodes[i].m_pUnicodes;
-        for (int j = 0; j < 128; j++) {
-          CFX_ByteString name = PDF_AdobeNameFromUnicode(pUnicodes[j]);
-          if (name.IsEmpty()) {
-            pArray->AddName(".notdef");
-          } else {
-            pArray->AddName(name);
-          }
-        }
-        pEncoding->SetAt("Differences", pArray);
-        AddIndirectObject(pEncoding);
-        pBaseDict->SetAtReference("Encoding", this, pEncoding);
-      }
-    }
-    if (weight > 0.0 && trait & kCTFontItalicTrait) {
-      basefont += ",BoldItalic";
-    } else if (weight > 0.0) {
-      basefont += ",Bold";
-    } else if (trait & kCTFontItalicTrait) {
-      basefont += ",Italic";
-    }
-    pBaseDict->SetAtName("Subtype", "TrueType");
-    pBaseDict->SetAtName("BaseFont", basefont);
-    pBaseDict->SetAtNumber("FirstChar", 32);
-    pBaseDict->SetAtNumber("LastChar", 255);
-    int char_widths[224];
-    FX_GetCharWidth(font, 32, 255, char_widths);
-    CPDF_Array* pWidths = new CPDF_Array;
-    for (int i = 0; i < 224; i++) {
-      pWidths->AddInteger(char_widths[i]);
-    }
-    pBaseDict->SetAt("Widths", pWidths);
-  } else {
-    flags |= PDFFONT_NONSYMBOLIC;
-    CPDF_Array* pArray = NULL;
-    pFontDict = new CPDF_Dictionary;
-    CFX_ByteString cmap;
-    CFX_ByteString ordering;
-    int supplement;
-    FX_BOOL bFound = FALSE;
-    CPDF_Array* pWidthArray = new CPDF_Array;
-    if (IsHasCharSet(languages, {FXFONT_CHINESEBIG5_CHARSET})) {
-      cmap = bVert ? "ETenms-B5-V" : "ETenms-B5-H";
-      ordering = "CNS1";
-      supplement = 4;
-      pWidthArray->AddInteger(1);
-      _InsertWidthArray(font, 0x20, 0x7e, pWidthArray);
-      bFound = TRUE;
-    }
-    if (!bFound && IsHasCharSet(languages, {FXFONT_GB2312_CHARSET})) {
-      cmap = bVert ? "GBK-EUC-V" : "GBK-EUC-H";
-      ordering = "GB1", supplement = 2;
-      pWidthArray->AddInteger(7716);
-      _InsertWidthArray(font, 0x20, 0x20, pWidthArray);
-      pWidthArray->AddInteger(814);
-      _InsertWidthArray(font, 0x21, 0x7e, pWidthArray);
-      bFound = TRUE;
-    }
-    if (!bFound && IsHasCharSet(languages, {FXFONT_HANGEUL_CHARSET})) {
-      cmap = bVert ? "KSCms-UHC-V" : "KSCms-UHC-H";
-      ordering = "Korea1";
-      supplement = 2;
-      pWidthArray->AddInteger(1);
-      _InsertWidthArray(font, 0x20, 0x7e, pWidthArray);
-      bFound = TRUE;
-    }
-    if (!bFound && IsHasCharSet(languages, {FXFONT_SHIFTJIS_CHARSET})) {
-      cmap = bVert ? "90ms-RKSJ-V" : "90ms-RKSJ-H";
-      ordering = "Japan1";
-      supplement = 5;
-      pWidthArray->AddInteger(231);
-      _InsertWidthArray(font, 0x20, 0x7d, pWidthArray);
-      pWidthArray->AddInteger(326);
-      _InsertWidthArray(font, 0xa0, 0xa0, pWidthArray);
-      pWidthArray->AddInteger(327);
-      _InsertWidthArray(font, 0xa1, 0xdf, pWidthArray);
-      pWidthArray->AddInteger(631);
-      _InsertWidthArray(font, 0x7e, 0x7e, pWidthArray);
-    }
-    pBaseDict->SetAtName("Subtype", "Type0");
-    pBaseDict->SetAtName("BaseFont", basefont);
-    pBaseDict->SetAtName("Encoding", cmap);
-    pFontDict->SetAt("W", pWidthArray);
-    pFontDict->SetAtName("Type", "Font");
-    pFontDict->SetAtName("Subtype", "CIDFontType2");
-    pFontDict->SetAtName("BaseFont", basefont);
-    CPDF_Dictionary* pCIDSysInfo = new CPDF_Dictionary;
-    pCIDSysInfo->SetAtString("Registry", "Adobe");
-    pCIDSysInfo->SetAtString("Ordering", ordering);
-    pCIDSysInfo->SetAtInteger("Supplement", supplement);
-    pFontDict->SetAt("CIDSystemInfo", pCIDSysInfo);
-    pArray = new CPDF_Array;
-    pBaseDict->SetAt("DescendantFonts", pArray);
-    AddIndirectObject(pFontDict);
-    pArray->AddReference(this, pFontDict);
-  }
-  AddIndirectObject(pBaseDict);
-  CPDF_Dictionary* pFontDesc = new CPDF_Dictionary;
-  pFontDesc->SetAtName("Type", "FontDescriptor");
-  pFontDesc->SetAtName("FontName", basefont);
-  pFontDesc->SetAtInteger("Flags", flags);
-  CPDF_Array* pBBox = new CPDF_Array;
-  for (int i = 0; i < 4; i++) {
-    pBBox->AddInteger(bbox[i]);
-  }
-  pFontDesc->SetAt("FontBBox", pBBox);
-  pFontDesc->SetAtInteger("ItalicAngle", italicangle);
-  pFontDesc->SetAtInteger("Ascent", ascend);
-  pFontDesc->SetAtInteger("Descent", descend);
-  pFontDesc->SetAtInteger("CapHeight", capheight);
-  CGFloat fStemV = 0;
-  int16_t min_width = SHRT_MAX;
-
-  static const UniChar stem_chars[] = {'i', 'I', '!', '1'};
-  CGGlyph glyphs[FX_ArraySize(stem_chars)];
-  CGRect boundingRects[FX_ArraySize(stem_chars)];
-
-  const size_t count = FX_ArraySize(stem_chars);
-  if (CTFontGetGlyphsForCharacters(font, stem_chars, glyphs, count)) {
-    CTFontGetBoundingRectsForGlyphs(font, kCTFontHorizontalOrientation, glyphs,
-                                    boundingRects, count);
-    for (size_t i = 0; i < count; i++) {
-      int16_t width = boundingRects[i].size.width;
-      if (width > 0 && width < min_width) {
-        min_width = width;
-        fStemV = min_width;
-      }
-    }
-  }
-  pFontDesc->SetAtInteger("StemV", fStemV);
-  AddIndirectObject(pFontDesc);
-  pFontDict->SetAtReference("FontDescriptor", this, pFontDesc);
-  CFRelease(traits);
-  CFRelease(languages);
-  return LoadFont(pBaseDict);
-}
-#endif  // (_FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_)
-
-static void _InsertWidthArray1(CFX_Font* pFont,
-                               CFX_UnicodeEncoding* pEncoding,
-                               FX_WCHAR start,
-                               FX_WCHAR end,
-                               CPDF_Array* pWidthArray) {
-  int size = end - start + 1;
-  int* widths = FX_Alloc(int, size);
-  int i;
-  for (i = 0; i < size; i++) {
-    int glyph_index = pEncoding->GlyphFromCharCode(start + i);
-    widths[i] = pFont->GetGlyphWidth(glyph_index);
-  }
-  for (i = 1; i < size; i++)
-    if (widths[i] != *widths) {
-      break;
-    }
-  if (i == size) {
-    int first = pWidthArray->GetIntegerAt(pWidthArray->GetCount() - 1);
-    pWidthArray->AddInteger(first + size - 1);
-    pWidthArray->AddInteger(*widths);
-  } else {
-    CPDF_Array* pWidthArray1 = new CPDF_Array;
-    pWidthArray->Add(pWidthArray1);
-    for (i = 0; i < size; i++) {
-      pWidthArray1->AddInteger(widths[i]);
-    }
-  }
-  FX_Free(widths);
-}
-
-CPDF_Font* CPDF_Document::AddFont(CFX_Font* pFont, int charset, FX_BOOL bVert) {
-  if (!pFont) {
-    return NULL;
-  }
-  bool bCJK = charset == FXFONT_CHINESEBIG5_CHARSET ||
-              charset == FXFONT_GB2312_CHARSET ||
-              charset == FXFONT_HANGEUL_CHARSET ||
-              charset == FXFONT_SHIFTJIS_CHARSET;
-  CFX_ByteString basefont = pFont->GetFamilyName();
-  basefont.Replace(" ", "");
-  int flags = 0;
-  if (pFont->IsBold()) {
-    flags |= PDFFONT_FORCEBOLD;
-  }
-  if (pFont->IsItalic()) {
-    flags |= PDFFONT_ITALIC;
-  }
-  if (pFont->IsFixedWidth()) {
-    flags |= PDFFONT_FIXEDPITCH;
-  }
-  CPDF_Dictionary* pBaseDict = new CPDF_Dictionary;
-  pBaseDict->SetAtName("Type", "Font");
-  std::unique_ptr<CFX_UnicodeEncoding> pEncoding(
-      new CFX_UnicodeEncoding(pFont));
-  CPDF_Dictionary* pFontDict = pBaseDict;
-  if (!bCJK) {
-    CPDF_Array* pWidths = new CPDF_Array;
-    int charcode;
-    for (charcode = 32; charcode < 128; charcode++) {
-      int glyph_index = pEncoding->GlyphFromCharCode(charcode);
-      int char_width = pFont->GetGlyphWidth(glyph_index);
-      pWidths->AddInteger(char_width);
-    }
-    if (charset == FXFONT_ANSI_CHARSET || charset == FXFONT_DEFAULT_CHARSET ||
-        charset == FXFONT_SYMBOL_CHARSET) {
-      if (charset == FXFONT_SYMBOL_CHARSET) {
-        flags |= PDFFONT_SYMBOLIC;
-      } else {
-        flags |= PDFFONT_NONSYMBOLIC;
-      }
-      pBaseDict->SetAtName("Encoding", "WinAnsiEncoding");
-      for (charcode = 128; charcode <= 255; charcode++) {
-        int glyph_index = pEncoding->GlyphFromCharCode(charcode);
-        int char_width = pFont->GetGlyphWidth(glyph_index);
-        pWidths->AddInteger(char_width);
-      }
-    } else {
-      flags |= PDFFONT_NONSYMBOLIC;
-      size_t i;
-      for (i = 0; i < sizeof g_FX_CharsetUnicodes / sizeof(FX_CharsetUnicodes);
-           i++)
-        if (g_FX_CharsetUnicodes[i].m_Charset == charset) {
-          break;
-        }
-      if (i < sizeof g_FX_CharsetUnicodes / sizeof(FX_CharsetUnicodes)) {
-        CPDF_Dictionary* pEncodingDict = new CPDF_Dictionary;
-        pEncodingDict->SetAtName("BaseEncoding", "WinAnsiEncoding");
-        CPDF_Array* pArray = new CPDF_Array;
-        pArray->AddInteger(128);
-        const uint16_t* pUnicodes = g_FX_CharsetUnicodes[i].m_pUnicodes;
-        for (int j = 0; j < 128; j++) {
-          CFX_ByteString name = PDF_AdobeNameFromUnicode(pUnicodes[j]);
-          if (name.IsEmpty()) {
-            pArray->AddName(".notdef");
-          } else {
-            pArray->AddName(name);
-          }
-          int glyph_index = pEncoding->GlyphFromCharCode(pUnicodes[j]);
-          int char_width = pFont->GetGlyphWidth(glyph_index);
-          pWidths->AddInteger(char_width);
-        }
-        pEncodingDict->SetAt("Differences", pArray);
-        AddIndirectObject(pEncodingDict);
-        pBaseDict->SetAtReference("Encoding", this, pEncodingDict);
-      }
-    }
-    if (pFont->IsBold() && pFont->IsItalic()) {
-      basefont += ",BoldItalic";
-    } else if (pFont->IsBold()) {
-      basefont += ",Bold";
-    } else if (pFont->IsItalic()) {
-      basefont += ",Italic";
-    }
-    pBaseDict->SetAtName("Subtype", "TrueType");
-    pBaseDict->SetAtName("BaseFont", basefont);
-    pBaseDict->SetAtNumber("FirstChar", 32);
-    pBaseDict->SetAtNumber("LastChar", 255);
-    pBaseDict->SetAt("Widths", pWidths);
-  } else {
-    flags |= PDFFONT_NONSYMBOLIC;
-    pFontDict = new CPDF_Dictionary;
-    CFX_ByteString cmap;
-    CFX_ByteString ordering;
-    int supplement = 0;
-    CPDF_Array* pWidthArray = new CPDF_Array;
-    switch (charset) {
-      case FXFONT_CHINESEBIG5_CHARSET:
-        cmap = bVert ? "ETenms-B5-V" : "ETenms-B5-H";
-        ordering = "CNS1";
-        supplement = 4;
-        pWidthArray->AddInteger(1);
-        _InsertWidthArray1(pFont, pEncoding.get(), 0x20, 0x7e, pWidthArray);
-        break;
-      case FXFONT_GB2312_CHARSET:
-        cmap = bVert ? "GBK-EUC-V" : "GBK-EUC-H";
-        ordering = "GB1";
-        supplement = 2;
-        pWidthArray->AddInteger(7716);
-        _InsertWidthArray1(pFont, pEncoding.get(), 0x20, 0x20, pWidthArray);
-        pWidthArray->AddInteger(814);
-        _InsertWidthArray1(pFont, pEncoding.get(), 0x21, 0x7e, pWidthArray);
-        break;
-      case FXFONT_HANGEUL_CHARSET:
-        cmap = bVert ? "KSCms-UHC-V" : "KSCms-UHC-H";
-        ordering = "Korea1";
-        supplement = 2;
-        pWidthArray->AddInteger(1);
-        _InsertWidthArray1(pFont, pEncoding.get(), 0x20, 0x7e, pWidthArray);
-        break;
-      case FXFONT_SHIFTJIS_CHARSET:
-        cmap = bVert ? "90ms-RKSJ-V" : "90ms-RKSJ-H";
-        ordering = "Japan1";
-        supplement = 5;
-        pWidthArray->AddInteger(231);
-        _InsertWidthArray1(pFont, pEncoding.get(), 0x20, 0x7d, pWidthArray);
-        pWidthArray->AddInteger(326);
-        _InsertWidthArray1(pFont, pEncoding.get(), 0xa0, 0xa0, pWidthArray);
-        pWidthArray->AddInteger(327);
-        _InsertWidthArray1(pFont, pEncoding.get(), 0xa1, 0xdf, pWidthArray);
-        pWidthArray->AddInteger(631);
-        _InsertWidthArray1(pFont, pEncoding.get(), 0x7e, 0x7e, pWidthArray);
-        break;
-    }
-    pBaseDict->SetAtName("Subtype", "Type0");
-    pBaseDict->SetAtName("BaseFont", basefont);
-    pBaseDict->SetAtName("Encoding", cmap);
-    pFontDict->SetAt("W", pWidthArray);
-    pFontDict->SetAtName("Type", "Font");
-    pFontDict->SetAtName("Subtype", "CIDFontType2");
-    pFontDict->SetAtName("BaseFont", basefont);
-    CPDF_Dictionary* pCIDSysInfo = new CPDF_Dictionary;
-    pCIDSysInfo->SetAtString("Registry", "Adobe");
-    pCIDSysInfo->SetAtString("Ordering", ordering);
-    pCIDSysInfo->SetAtInteger("Supplement", supplement);
-    pFontDict->SetAt("CIDSystemInfo", pCIDSysInfo);
-    CPDF_Array* pArray = new CPDF_Array;
-    pBaseDict->SetAt("DescendantFonts", pArray);
-    AddIndirectObject(pFontDict);
-    pArray->AddReference(this, pFontDict);
-  }
-  AddIndirectObject(pBaseDict);
-  CPDF_Dictionary* pFontDesc = new CPDF_Dictionary;
-  pFontDesc->SetAtName("Type", "FontDescriptor");
-  pFontDesc->SetAtName("FontName", basefont);
-  pFontDesc->SetAtInteger("Flags", flags);
-  pFontDesc->SetAtInteger(
-      "ItalicAngle",
-      pFont->GetSubstFont() ? pFont->GetSubstFont()->m_ItalicAngle : 0);
-  pFontDesc->SetAtInteger("Ascent", pFont->GetAscent());
-  pFontDesc->SetAtInteger("Descent", pFont->GetDescent());
-  FX_RECT bbox;
-  pFont->GetBBox(bbox);
-  CPDF_Array* pBBox = new CPDF_Array;
-  pBBox->AddInteger(bbox.left);
-  pBBox->AddInteger(bbox.bottom);
-  pBBox->AddInteger(bbox.right);
-  pBBox->AddInteger(bbox.top);
-  pFontDesc->SetAt("FontBBox", pBBox);
-  int32_t nStemV = 0;
-  if (pFont->GetSubstFont()) {
-    nStemV = pFont->GetSubstFont()->m_Weight / 5;
-  } else {
-    static const FX_CHAR stem_chars[] = {'i', 'I', '!', '1'};
-    const size_t count = sizeof(stem_chars) / sizeof(stem_chars[0]);
-    uint32_t glyph = pEncoding->GlyphFromCharCode(stem_chars[0]);
-    nStemV = pFont->GetGlyphWidth(glyph);
-    for (size_t i = 1; i < count; i++) {
-      glyph = pEncoding->GlyphFromCharCode(stem_chars[i]);
-      int width = pFont->GetGlyphWidth(glyph);
-      if (width > 0 && width < nStemV) {
-        nStemV = width;
-      }
-    }
-  }
-  pFontDesc->SetAtInteger("StemV", nStemV);
-  AddIndirectObject(pFontDesc);
-  pFontDict->SetAtReference("FontDescriptor", this, pFontDesc);
-  return LoadFont(pBaseDict);
-}
-static int InsertDeletePDFPage(CPDF_Document* pDoc,
-                               CPDF_Dictionary* pPages,
-                               int nPagesToGo,
-                               CPDF_Dictionary* pPage,
-                               FX_BOOL bInsert,
-                               std::set<CPDF_Dictionary*>* pVisited) {
-  CPDF_Array* pKidList = pPages->GetArrayBy("Kids");
-  if (!pKidList)
-    return -1;
-
-  for (size_t i = 0; i < pKidList->GetCount(); i++) {
-    CPDF_Dictionary* pKid = pKidList->GetDictAt(i);
-    if (pKid->GetStringBy("Type") == "Page") {
-      if (nPagesToGo == 0) {
-        if (bInsert) {
-          pKidList->InsertAt(i, new CPDF_Reference(pDoc, pPage->GetObjNum()));
-          pPage->SetAtReference("Parent", pDoc, pPages->GetObjNum());
-        } else {
-          pKidList->RemoveAt(i);
-        }
-        pPages->SetAtInteger(
-            "Count", pPages->GetIntegerBy("Count") + (bInsert ? 1 : -1));
-        return 1;
-      }
-      nPagesToGo--;
-    } else {
-      int nPages = pKid->GetIntegerBy("Count");
-      if (nPagesToGo < nPages) {
-        if (pdfium::ContainsValue(*pVisited, pKid))
-          return -1;
-        pdfium::ScopedSetInsertion<CPDF_Dictionary*>(pVisited, pKid);
-        if (InsertDeletePDFPage(pDoc, pKid, nPagesToGo, pPage, bInsert,
-                                pVisited) < 0) {
-          return -1;
-        }
-        pPages->SetAtInteger(
-            "Count", pPages->GetIntegerBy("Count") + (bInsert ? 1 : -1));
-        return 1;
-      }
-      nPagesToGo -= nPages;
-    }
-  }
-  return 0;
-}
-static int InsertNewPage(CPDF_Document* pDoc,
-                         int iPage,
-                         CPDF_Dictionary* pPageDict,
-                         CFX_ArrayTemplate<uint32_t>& pageList) {
-  CPDF_Dictionary* pRoot = pDoc->GetRoot();
-  if (!pRoot) {
-    return -1;
-  }
-  CPDF_Dictionary* pPages = pRoot->GetDictBy("Pages");
-  if (!pPages) {
-    return -1;
-  }
-  int nPages = pDoc->GetPageCount();
-  if (iPage < 0 || iPage > nPages) {
-    return -1;
-  }
-  if (iPage == nPages) {
-    CPDF_Array* pPagesList = pPages->GetArrayBy("Kids");
-    if (!pPagesList) {
-      pPagesList = new CPDF_Array;
-      pPages->SetAt("Kids", pPagesList);
-    }
-    pPagesList->Add(pPageDict, pDoc);
-    pPages->SetAtInteger("Count", nPages + 1);
-    pPageDict->SetAtReference("Parent", pDoc, pPages->GetObjNum());
-  } else {
-    std::set<CPDF_Dictionary*> stack = {pPages};
-    if (InsertDeletePDFPage(pDoc, pPages, iPage, pPageDict, TRUE, &stack) < 0)
-      return -1;
-  }
-  pageList.InsertAt(iPage, pPageDict->GetObjNum());
-  return iPage;
-}
-CPDF_Dictionary* CPDF_Document::CreateNewPage(int iPage) {
-  CPDF_Dictionary* pDict = new CPDF_Dictionary;
-  pDict->SetAtName("Type", "Page");
-  uint32_t dwObjNum = AddIndirectObject(pDict);
-  if (InsertNewPage(this, iPage, pDict, m_PageList) < 0) {
-    ReleaseIndirectObject(dwObjNum);
-    return NULL;
-  }
-  return pDict;
-}
-
-CPDF_Font* CPDF_Document::AddStandardFont(const FX_CHAR* font,
-                                          CPDF_FontEncoding* pEncoding) {
-  CFX_ByteString name(font);
-  if (PDF_GetStandardFontName(&name) < 0)
-    return nullptr;
-  return GetPageData()->GetStandardFont(name.AsStringC(), pEncoding);
-}
-
-void CPDF_Document::DeletePage(int iPage) {
-  CPDF_Dictionary* pRoot = GetRoot();
-  if (!pRoot)
-    return;
-
-  CPDF_Dictionary* pPages = pRoot->GetDictBy("Pages");
-  if (!pPages)
-    return;
-
-  int nPages = pPages->GetIntegerBy("Count");
-  if (iPage < 0 || iPage >= nPages)
-    return;
-
-  std::set<CPDF_Dictionary*> stack = {pPages};
-  if (InsertDeletePDFPage(this, pPages, iPage, nullptr, FALSE, &stack) < 0)
-    return;
-
-  m_PageList.RemoveAt(iPage);
-}
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
index 14621fc2b3..dfc21b47cb 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
@@ -24,40 +24,6 @@ void CPDF_ModuleMgr::InitPageModule() {
   m_pPageModule.reset(new CPDF_PageModule);
 }
 
-CPDF_Font* CPDF_Document::LoadFont(CPDF_Dictionary* pFontDict) {
-  ASSERT(pFontDict);
-  return GetValidatePageData()->GetFont(pFontDict, FALSE);
-}
-
-CPDF_StreamAcc* CPDF_Document::LoadFontFile(CPDF_Stream* pStream) {
-  return GetValidatePageData()->GetFontFileStreamAcc(pStream);
-}
-
-CPDF_ColorSpace* CPDF_Document::LoadColorSpace(CPDF_Object* pCSObj,
-                                               CPDF_Dictionary* pResources) {
-  return GetValidatePageData()->GetColorSpace(pCSObj, pResources);
-}
-CPDF_Pattern* CPDF_Document::LoadPattern(CPDF_Object* pPatternObj,
-                                         FX_BOOL bShading,
-                                         const CFX_Matrix* matrix) {
-  return GetValidatePageData()->GetPattern(pPatternObj, bShading, matrix);
-}
-CPDF_IccProfile* CPDF_Document::LoadIccProfile(CPDF_Stream* pStream) {
-  return GetValidatePageData()->GetIccProfile(pStream);
-}
-CPDF_Image* CPDF_Document::LoadImageF(CPDF_Object* pObj) {
-  if (!pObj) {
-    return NULL;
-  }
-  FXSYS_assert(pObj->GetObjNum());
-  return GetValidatePageData()->GetImage(pObj);
-}
-void CPDF_Document::RemoveColorSpaceFromPageData(CPDF_Object* pCSObj) {
-  if (!pCSObj) {
-    return;
-  }
-  GetPageData()->ReleaseColorSpace(pCSObj);
-}
 CPDF_DocPageData::CPDF_DocPageData(CPDF_Document* pPDFDoc)
     : m_pPDFDoc(pPDFDoc), m_bForceClear(FALSE) {}
 
diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.cpp b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
index 4557af2b9e..c92e177dcc 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_document.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
@@ -8,6 +8,7 @@
 
 #include <set>
 
+#include "core/fpdfapi/fpdf_font/include/cpdf_fontencoding.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
@@ -22,6 +23,428 @@
 
 namespace {
 
+const int FX_MAX_PAGE_LEVEL = 1024;
+
+const uint16_t g_FX_CP874Unicodes[128] = {
+    0x20AC, 0x0000, 0x0000, 0x0000, 0x0000, 0x2026, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2018,
+    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00A0, 0x0E01, 0x0E02, 0x0E03,
+    0x0E04, 0x0E05, 0x0E06, 0x0E07, 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C,
+    0x0E0D, 0x0E0E, 0x0E0F, 0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15,
+    0x0E16, 0x0E17, 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E,
+    0x0E1F, 0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
+    0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F, 0x0E30,
+    0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, 0x0E38, 0x0E39,
+    0x0E3A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0E3F, 0x0E40, 0x0E41, 0x0E42,
+    0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, 0x0E48, 0x0E49, 0x0E4A, 0x0E4B,
+    0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F, 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54,
+    0x0E55, 0x0E56, 0x0E57, 0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0x0000, 0x0000,
+    0x0000, 0x0000,
+};
+const uint16_t g_FX_CP1250Unicodes[128] = {
+    0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021, 0x0000,
+    0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179, 0x0000, 0x2018,
+    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x0000, 0x2122, 0x0161,
+    0x203A, 0x015B, 0x0165, 0x017E, 0x017A, 0x00A0, 0x02C7, 0x02D8, 0x0141,
+    0x00A4, 0x0104, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC,
+    0x00AD, 0x00AE, 0x017B, 0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5,
+    0x00B6, 0x00B7, 0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E,
+    0x017C, 0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
+    0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E, 0x0110,
+    0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7, 0x0158, 0x016E,
+    0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF, 0x0155, 0x00E1, 0x00E2,
+    0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, 0x010D, 0x00E9, 0x0119, 0x00EB,
+    0x011B, 0x00ED, 0x00EE, 0x010F, 0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4,
+    0x0151, 0x00F6, 0x00F7, 0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD,
+    0x0163, 0x02D9,
+};
+const uint16_t g_FX_CP1251Unicodes[128] = {
+    0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021, 0x20AC,
+    0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F, 0x0452, 0x2018,
+    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x0000, 0x2122, 0x0459,
+    0x203A, 0x045A, 0x045C, 0x045B, 0x045F, 0x00A0, 0x040E, 0x045E, 0x0408,
+    0x00A4, 0x0490, 0x00A6, 0x00A7, 0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC,
+    0x00AD, 0x00AE, 0x0407, 0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5,
+    0x00B6, 0x00B7, 0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455,
+    0x0457, 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
+    0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420,
+    0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429,
+    0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 0x0430, 0x0431, 0x0432,
+    0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B,
+    0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444,
+    0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D,
+    0x044E, 0x044F,
+};
+const uint16_t g_FX_CP1253Unicodes[128] = {
+    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x0000,
+    0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2018,
+    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x0000, 0x2122, 0x0000,
+    0x203A, 0x0000, 0x0000, 0x0000, 0x0000, 0x00A0, 0x0385, 0x0386, 0x00A3,
+    0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x0000, 0x00AB, 0x00AC,
+    0x00AD, 0x00AE, 0x2015, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5,
+    0x00B6, 0x00B7, 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E,
+    0x038F, 0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
+    0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0,
+    0x03A1, 0x0000, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9,
+    0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF, 0x03B0, 0x03B1, 0x03B2,
+    0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB,
+    0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4,
+    0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD,
+    0x03CE, 0x0000,
+};
+const uint16_t g_FX_CP1254Unicodes[128] = {
+    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6,
+    0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000, 0x0000, 0x2018,
+    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x02DC, 0x2122, 0x0161,
+    0x203A, 0x0153, 0x0000, 0x0000, 0x0178, 0x00A0, 0x00A1, 0x00A2, 0x00A3,
+    0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC,
+    0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5,
+    0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE,
+    0x00BF, 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x011E,
+    0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9,
+    0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF, 0x00E0, 0x00E1, 0x00E2,
+    0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB,
+    0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4,
+    0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131,
+    0x015F, 0x00FF,
+};
+const uint16_t g_FX_CP1255Unicodes[128] = {
+    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6,
+    0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2018,
+    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x02DC, 0x2122, 0x0000,
+    0x203A, 0x0000, 0x0000, 0x0000, 0x0000, 0x00A0, 0x00A1, 0x00A2, 0x00A3,
+    0x20AA, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC,
+    0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5,
+    0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE,
+    0x00BF, 0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7,
+    0x05B8, 0x05B9, 0x0000, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF, 0x05C0,
+    0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3, 0x05F4, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x05D0, 0x05D1, 0x05D2,
+    0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB,
+    0x05DC, 0x05DD, 0x05DE, 0x05DF, 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4,
+    0x05E5, 0x05E6, 0x05E7, 0x05E8, 0x05E9, 0x05EA, 0x0000, 0x0000, 0x200E,
+    0x200F, 0x0000,
+};
+const uint16_t g_FX_CP1256Unicodes[128] = {
+    0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6,
+    0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688, 0x06AF, 0x2018,
+    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x06A9, 0x2122, 0x0691,
+    0x203A, 0x0153, 0x200C, 0x200D, 0x06BA, 0x00A0, 0x060C, 0x00A2, 0x00A3,
+    0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC,
+    0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5,
+    0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE,
+    0x061F, 0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
+    0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, 0x0630,
+    0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7, 0x0637, 0x0638,
+    0x0639, 0x063A, 0x0640, 0x0641, 0x0642, 0x0643, 0x00E0, 0x0644, 0x00E2,
+    0x0645, 0x0646, 0x0647, 0x0648, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB,
+    0x0649, 0x064A, 0x00EE, 0x00EF, 0x064B, 0x064C, 0x064D, 0x064E, 0x00F4,
+    0x064F, 0x0650, 0x00F7, 0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E,
+    0x200F, 0x06D2,
+};
+const uint16_t g_FX_CP1257Unicodes[128] = {
+    0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021, 0x0000,
+    0x2030, 0x0000, 0x2039, 0x0000, 0x00A8, 0x02C7, 0x00B8, 0x0000, 0x2018,
+    0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x0000, 0x2122, 0x0000,
+    0x203A, 0x0000, 0x00AF, 0x02DB, 0x0000, 0x00A0, 0x0000, 0x00A2, 0x00A3,
+    0x00A4, 0x0000, 0x00A6, 0x00A7, 0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC,
+    0x00AD, 0x00AE, 0x00C6, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5,
+    0x00B6, 0x00B7, 0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE,
+    0x00E6, 0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
+    0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B, 0x0160,
+    0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, 0x0172, 0x0141,
+    0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF, 0x0105, 0x012F, 0x0101,
+    0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, 0x010D, 0x00E9, 0x017A, 0x0117,
+    0x0123, 0x0137, 0x012B, 0x013C, 0x0161, 0x0144, 0x0146, 0x00F3, 0x014D,
+    0x00F5, 0x00F6, 0x00F7, 0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C,
+    0x017E, 0x02D9,
+};
+
+struct FX_CharsetUnicodes {
+  uint8_t m_Charset;
+  const uint16_t* m_pUnicodes;
+};
+
+const FX_CharsetUnicodes g_FX_CharsetUnicodes[] = {
+    {FXFONT_THAI_CHARSET, g_FX_CP874Unicodes},
+    {FXFONT_EASTEUROPE_CHARSET, g_FX_CP1250Unicodes},
+    {FXFONT_RUSSIAN_CHARSET, g_FX_CP1251Unicodes},
+    {FXFONT_GREEK_CHARSET, g_FX_CP1253Unicodes},
+    {FXFONT_TURKISH_CHARSET, g_FX_CP1254Unicodes},
+    {FXFONT_HEBREW_CHARSET, g_FX_CP1255Unicodes},
+    {FXFONT_ARABIC_CHARSET, g_FX_CP1256Unicodes},
+    {FXFONT_BALTIC_CHARSET, g_FX_CP1257Unicodes},
+};
+
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+void InsertWidthArray(HDC hDC, int start, int end, CPDF_Array* pWidthArray) {
+  int size = end - start + 1;
+  int* widths = FX_Alloc(int, size);
+  GetCharWidth(hDC, start, end, widths);
+  int i;
+  for (i = 1; i < size; i++) {
+    if (widths[i] != *widths)
+      break;
+  }
+  if (i == size) {
+    int first = pWidthArray->GetIntegerAt(pWidthArray->GetCount() - 1);
+    pWidthArray->AddInteger(first + size - 1);
+    pWidthArray->AddInteger(*widths);
+  } else {
+    CPDF_Array* pWidthArray1 = new CPDF_Array;
+    pWidthArray->Add(pWidthArray1);
+    for (i = 0; i < size; i++) {
+      pWidthArray1->AddInteger(widths[i]);
+    }
+  }
+  FX_Free(widths);
+}
+
+CFX_ByteString FPDF_GetPSNameFromTT(HDC hDC) {
+  CFX_ByteString result;
+  DWORD size = ::GetFontData(hDC, 'eman', 0, nullptr, 0);
+  if (size != GDI_ERROR) {
+    LPBYTE buffer = FX_Alloc(BYTE, size);
+    ::GetFontData(hDC, 'eman', 0, buffer, size);
+    result = GetNameFromTT(buffer, size, 6);
+    FX_Free(buffer);
+  }
+  return result;
+}
+#endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+struct FX_LANG2CS {
+  uint32_t uLang;
+  uint8_t uCharset;
+};
+const FX_LANG2CS gs_FXLang2CharsetTable[] = {
+    {3109, 0},         {3121, 178}, {3129, 162}, {3139, 204}, {3141, 204},
+    {3166, 0},         {3184, 238}, {3197, 0},   {3201, 0},   {3239, 161},
+    {3241, 0},         {3246, 0},   {3247, 186}, {3248, 0},   {3259, 178},
+    {3267, 0},         {3273, 0},   {3276, 0},   {3301, 0},   {3310, 1},
+    {3325, 177},       {3329, 1},   {3338, 238}, {3341, 238}, {3345, 1},
+    {3355, 0},         {3370, 0},   {3371, 0},   {3383, 128}, {3424, 204},
+    {3427, 1},         {3428, 129}, {3436, 178}, {3464, 186}, {3466, 186},
+    {3486, 204},       {3487, 0},   {3493, 1},   {3494, 0},   {3508, 0},
+    {3518, 0},         {3520, 0},   {3569, 1},   {3580, 238}, {3588, 0},
+    {3645, 238},       {3651, 204}, {3672, 238}, {3673, 238}, {3678, 238},
+    {3679, 238},       {3683, 0},   {3684, 0},   {3693, 1},   {3697, 1},
+    {3700, 222},       {3710, 162}, {3734, 204}, {3741, 178}, {3749, 162},
+    {3763, 163},       {3886, 134}, {105943, 0}, {106375, 1}, {3923451837, 134},
+    {3923451838, 136},
+};
+
+uint32_t FX_GetLangHashCode(const FX_CHAR* pStr) {
+  FXSYS_assert(pStr);
+  int32_t iLength = FXSYS_strlen(pStr);
+  const FX_CHAR* pStrEnd = pStr + iLength;
+  uint32_t uHashCode = 0;
+  while (pStr < pStrEnd)
+    uHashCode = 31 * uHashCode + tolower(*pStr++);
+  return uHashCode;
+}
+
+uint8_t FX_GetCsFromLangCode(uint32_t uCode) {
+  int32_t iStart = 0;
+  int32_t iEnd = FX_ArraySize(gs_FXLang2CharsetTable) - 1;
+  while (iStart <= iEnd) {
+    int32_t iMid = (iStart + iEnd) / 2;
+    const FX_LANG2CS& charset = gs_FXLang2CharsetTable[iMid];
+    if (uCode == charset.uLang)
+      return charset.uCharset;
+
+    if (uCode < charset.uLang)
+      iEnd = iMid - 1;
+    else
+      iStart = iMid + 1;
+  }
+  return 0;
+}
+
+uint8_t FX_GetCharsetFromLang(const FX_CHAR* pLang, int32_t iLength) {
+  FXSYS_assert(pLang);
+  if (iLength < 0)
+    iLength = FXSYS_strlen(pLang);
+
+  uint32_t uHash = FX_GetLangHashCode(pLang);
+  return FX_GetCsFromLangCode(uHash);
+}
+
+void CFString2CFXByteString(CFStringRef src, CFX_ByteString& dest) {
+  SInt32 len = CFStringGetLength(src);
+  CFRange range = CFRangeMake(0, len);
+  CFIndex used = 0;
+  UInt8* pBuffer = (UInt8*)calloc(len + 1, sizeof(UInt8));
+  CFStringGetBytes(src, range, kCFStringEncodingASCII, 0, false, pBuffer, len,
+                   &used);
+  dest = (FX_CHAR*)pBuffer;
+  free(pBuffer);
+}
+
+bool HasCharSet(CFArrayRef languages, const std::vector<uint8_t>& charsets) {
+  for (int i = 0; i < CFArrayGetCount(languages); ++i) {
+    CFStringRef language = (CFStringRef)CFArrayGetValueAtIndex(languages, i);
+    uint8_t charset = FX_GetCharsetFromLang(
+        CFStringGetCStringPtr(language, kCFStringEncodingMacRoman), -1);
+    if (pdfium::ContainsValue(charsets, charset))
+      return true;
+  }
+  return false;
+}
+
+void FX_GetCharWidth(CTFontRef font, UniChar start, UniChar end, int* width) {
+  CGFloat size = CTFontGetSize(font);
+  for (; start <= end; ++start) {
+    CGGlyph pGlyph = 0;
+    CFIndex count = 1;
+    CTFontGetGlyphsForCharacters(font, &start, &pGlyph, count);
+    CGSize advances;
+    CTFontGetAdvancesForGlyphs(font, kCTFontDefaultOrientation, &pGlyph,
+                               &advances, 1);
+    *width = (int)(advances.width / size * 1000);
+    width++;
+  }
+}
+
+void InsertWidthArray(CTFontRef font,
+                      int start,
+                      int end,
+                      CPDF_Array* pWidthArray) {
+  int size = end - start + 1;
+  int* widths = FX_Alloc(int, size);
+  FX_GetCharWidth(font, start, end, widths);
+  int i;
+  for (i = 1; i < size; i++) {
+    if (widths[i] != *widths)
+      break;
+  }
+  if (i == size) {
+    int first = pWidthArray->GetIntegerAt(pWidthArray->GetCount() - 1);
+    pWidthArray->AddInteger(first + size - 1);
+    pWidthArray->AddInteger(*widths);
+  } else {
+    CPDF_Array* pWidthArray1 = new CPDF_Array;
+    pWidthArray->Add(pWidthArray1);
+    for (i = 0; i < size; i++) {
+      pWidthArray1->AddInteger(widths[i]);
+    }
+  }
+  FX_Free(widths);
+}
+#endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+
+void InsertWidthArray1(CFX_Font* pFont,
+                       CFX_UnicodeEncoding* pEncoding,
+                       FX_WCHAR start,
+                       FX_WCHAR end,
+                       CPDF_Array* pWidthArray) {
+  int size = end - start + 1;
+  int* widths = FX_Alloc(int, size);
+  int i;
+  for (i = 0; i < size; i++) {
+    int glyph_index = pEncoding->GlyphFromCharCode(start + i);
+    widths[i] = pFont->GetGlyphWidth(glyph_index);
+  }
+  for (i = 1; i < size; i++) {
+    if (widths[i] != *widths)
+      break;
+  }
+  if (i == size) {
+    int first = pWidthArray->GetIntegerAt(pWidthArray->GetCount() - 1);
+    pWidthArray->AddInteger(first + size - 1);
+    pWidthArray->AddInteger(*widths);
+  } else {
+    CPDF_Array* pWidthArray1 = new CPDF_Array;
+    pWidthArray->Add(pWidthArray1);
+    for (i = 0; i < size; i++) {
+      pWidthArray1->AddInteger(widths[i]);
+    }
+  }
+  FX_Free(widths);
+}
+
+int InsertDeletePDFPage(CPDF_Document* pDoc,
+                        CPDF_Dictionary* pPages,
+                        int nPagesToGo,
+                        CPDF_Dictionary* pPage,
+                        FX_BOOL bInsert,
+                        std::set<CPDF_Dictionary*>* pVisited) {
+  CPDF_Array* pKidList = pPages->GetArrayBy("Kids");
+  if (!pKidList)
+    return -1;
+
+  for (size_t i = 0; i < pKidList->GetCount(); i++) {
+    CPDF_Dictionary* pKid = pKidList->GetDictAt(i);
+    if (pKid->GetStringBy("Type") == "Page") {
+      if (nPagesToGo == 0) {
+        if (bInsert) {
+          pKidList->InsertAt(i, new CPDF_Reference(pDoc, pPage->GetObjNum()));
+          pPage->SetAtReference("Parent", pDoc, pPages->GetObjNum());
+        } else {
+          pKidList->RemoveAt(i);
+        }
+        pPages->SetAtInteger(
+            "Count", pPages->GetIntegerBy("Count") + (bInsert ? 1 : -1));
+        return 1;
+      }
+      nPagesToGo--;
+    } else {
+      int nPages = pKid->GetIntegerBy("Count");
+      if (nPagesToGo < nPages) {
+        if (pdfium::ContainsValue(*pVisited, pKid))
+          return -1;
+        pdfium::ScopedSetInsertion<CPDF_Dictionary*>(pVisited, pKid);
+        if (InsertDeletePDFPage(pDoc, pKid, nPagesToGo, pPage, bInsert,
+                                pVisited) < 0) {
+          return -1;
+        }
+        pPages->SetAtInteger(
+            "Count", pPages->GetIntegerBy("Count") + (bInsert ? 1 : -1));
+        return 1;
+      }
+      nPagesToGo -= nPages;
+    }
+  }
+  return 0;
+}
+
+int InsertNewPage(CPDF_Document* pDoc,
+                  int iPage,
+                  CPDF_Dictionary* pPageDict,
+                  CFX_ArrayTemplate<uint32_t>& pageList) {
+  CPDF_Dictionary* pRoot = pDoc->GetRoot();
+  if (!pRoot)
+    return -1;
+
+  CPDF_Dictionary* pPages = pRoot->GetDictBy("Pages");
+  if (!pPages)
+    return -1;
+
+  int nPages = pDoc->GetPageCount();
+  if (iPage < 0 || iPage > nPages)
+    return -1;
+
+  if (iPage == nPages) {
+    CPDF_Array* pPagesList = pPages->GetArrayBy("Kids");
+    if (!pPagesList) {
+      pPagesList = new CPDF_Array;
+      pPages->SetAt("Kids", pPagesList);
+    }
+    pPagesList->Add(pPageDict, pDoc);
+    pPages->SetAtInteger("Count", nPages + 1);
+    pPageDict->SetAtReference("Parent", pDoc, pPages->GetObjNum());
+  } else {
+    std::set<CPDF_Dictionary*> stack = {pPages};
+    if (InsertDeletePDFPage(pDoc, pPages, iPage, pPageDict, TRUE, &stack) < 0)
+      return -1;
+  }
+  pageList.InsertAt(iPage, pPageDict->GetObjNum());
+  return iPage;
+}
+
 int CountPages(CPDF_Dictionary* pPages,
                std::set<CPDF_Dictionary*>* visited_pages) {
   int count = pPages->GetIntegerBy("Count");
@@ -59,27 +482,14 @@ CPDF_Document::CPDF_Document(CPDF_Parser* pParser)
       m_pRootDict(nullptr),
       m_pInfoDict(nullptr),
       m_bLinearized(false),
-      m_dwFirstPageNo(0),
+      m_iFirstPageNo(0),
       m_dwFirstPageObjNum(0),
       m_pDocPage(new CPDF_DocPageData(this)),
-      m_pDocRender(new CPDF_DocRenderData(this)) {
-  ASSERT(pParser);
-}
-
-CPDF_DocPageData* CPDF_Document::GetValidatePageData() {
-  if (m_pDocPage)
-    return m_pDocPage;
-
-  m_pDocPage = new CPDF_DocPageData(this);
-  return m_pDocPage;
-}
-
-CPDF_DocRenderData* CPDF_Document::GetValidateRenderData() {
-  if (m_pDocRender)
-    return m_pDocRender;
+      m_pDocRender(new CPDF_DocRenderData(this)) {}
 
-  m_pDocRender = new CPDF_DocRenderData(this);
-  return m_pDocRender;
+CPDF_Document::~CPDF_Document() {
+  delete m_pDocPage;
+  CPDF_ModuleMgr::Get()->GetPageModule()->ClearStockFont(this);
 }
 
 void CPDF_Document::LoadDoc() {
@@ -103,8 +513,9 @@ void CPDF_Document::LoadDoc() {
   }
   m_PageList.SetSize(RetrievePageCount());
 }
+
 void CPDF_Document::LoadAsynDoc(CPDF_Dictionary* pLinearized) {
-  m_bLinearized = TRUE;
+  m_bLinearized = true;
   m_LastObjNum = m_pParser->GetLastObjNum();
   CPDF_Object* pIndirectObj = GetIndirectObject(m_pParser->GetRootObjNum());
   m_pRootDict = pIndirectObj ? pIndirectObj->GetDict() : nullptr;
@@ -126,7 +537,7 @@ void CPDF_Document::LoadAsynDoc(CPDF_Dictionary* pLinearized) {
   m_PageList.SetSize(dwPageCount);
   CPDF_Object* pNo = pLinearized->GetObjectBy("P");
   if (ToNumber(pNo))
-    m_dwFirstPageNo = pNo->GetInteger();
+    m_iFirstPageNo = pNo->GetInteger();
 
   CPDF_Object* pObjNum = pLinearized->GetObjectBy("O");
   if (ToNumber(pObjNum))
@@ -137,30 +548,17 @@ void CPDF_Document::LoadPages() {
   m_PageList.SetSize(RetrievePageCount());
 }
 
-CPDF_Document::~CPDF_Document() {
-  if (m_pDocPage) {
-    delete this->GetPageData();
-    CPDF_ModuleMgr::Get()->GetPageModule()->ClearStockFont(this);
-  }
-  if (m_pDocRender)
-    delete m_pDocRender;
-}
-
-#define FX_MAX_PAGE_LEVEL 1024
-CPDF_Dictionary* CPDF_Document::_FindPDFPage(CPDF_Dictionary* pPages,
-                                             int iPage,
-                                             int nPagesToGo,
-                                             int level) {
+CPDF_Dictionary* CPDF_Document::FindPDFPage(CPDF_Dictionary* pPages,
+                                            int iPage,
+                                            int nPagesToGo,
+                                            int level) {
   CPDF_Array* pKidList = pPages->GetArrayBy("Kids");
-  if (!pKidList) {
-    if (nPagesToGo == 0) {
-      return pPages;
-    }
-    return NULL;
-  }
-  if (level >= FX_MAX_PAGE_LEVEL) {
-    return NULL;
-  }
+  if (!pKidList)
+    return nPagesToGo == 0 ? pPages : nullptr;
+
+  if (level >= FX_MAX_PAGE_LEVEL)
+    return nullptr;
+
   for (size_t i = 0; i < pKidList->GetCount(); i++) {
     CPDF_Dictionary* pKid = pKidList->GetDictAt(i);
     if (!pKid) {
@@ -179,19 +577,19 @@ CPDF_Dictionary* CPDF_Document::_FindPDFPage(CPDF_Dictionary* pPages,
     } else {
       int nPages = pKid->GetIntegerBy("Count");
       if (nPagesToGo < nPages) {
-        return _FindPDFPage(pKid, iPage, nPagesToGo, level + 1);
+        return FindPDFPage(pKid, iPage, nPagesToGo, level + 1);
       }
       nPagesToGo -= nPages;
     }
   }
-  return NULL;
+  return nullptr;
 }
 
 CPDF_Dictionary* CPDF_Document::GetPage(int iPage) {
   if (iPage < 0 || iPage >= m_PageList.GetSize())
     return nullptr;
 
-  if (m_bLinearized && (iPage == (int)m_dwFirstPageNo)) {
+  if (m_bLinearized && (iPage == m_iFirstPageNo)) {
     if (CPDF_Dictionary* pDict =
             ToDictionary(GetIndirectObject(m_dwFirstPageObjNum))) {
       return pDict;
@@ -212,7 +610,7 @@ CPDF_Dictionary* CPDF_Document::GetPage(int iPage) {
   if (!pPages)
     return nullptr;
 
-  CPDF_Dictionary* pPage = _FindPDFPage(pPages, iPage, iPage, 0);
+  CPDF_Dictionary* pPage = FindPDFPage(pPages, iPage, iPage, 0);
   if (!pPage)
     return nullptr;
 
@@ -220,111 +618,109 @@ CPDF_Dictionary* CPDF_Document::GetPage(int iPage) {
   return pPage;
 }
 
-int CPDF_Document::_FindPageIndex(CPDF_Dictionary* pNode,
-                                  uint32_t& skip_count,
-                                  uint32_t objnum,
-                                  int& index,
-                                  int level) {
-  if (pNode->KeyExist("Kids")) {
-    CPDF_Array* pKidList = pNode->GetArrayBy("Kids");
-    if (!pKidList) {
-      return -1;
-    }
-    if (level >= FX_MAX_PAGE_LEVEL) {
-      return -1;
-    }
-    size_t count = pNode->GetIntegerBy("Count");
-    if (count <= skip_count) {
-      skip_count -= count;
-      index += count;
-      return -1;
-    }
-    if (count && count == pKidList->GetCount()) {
-      for (size_t i = 0; i < count; i++) {
-        if (CPDF_Reference* pKid = ToReference(pKidList->GetObjectAt(i))) {
-          if (pKid->GetRefObjNum() == objnum) {
-            m_PageList.SetAt(index + i, objnum);
-            return static_cast<int>(index + i);
-          }
-        }
-      }
-    }
-    for (size_t i = 0; i < pKidList->GetCount(); i++) {
-      CPDF_Dictionary* pKid = pKidList->GetDictAt(i);
-      if (!pKid) {
-        continue;
-      }
-      if (pKid == pNode) {
-        continue;
-      }
-      int found_index =
-          _FindPageIndex(pKid, skip_count, objnum, index, level + 1);
-      if (found_index >= 0) {
-        return found_index;
-      }
-    }
-  } else {
-    if (objnum == pNode->GetObjNum()) {
+int CPDF_Document::FindPageIndex(CPDF_Dictionary* pNode,
+                                 uint32_t& skip_count,
+                                 uint32_t objnum,
+                                 int& index,
+                                 int level) {
+  if (!pNode->KeyExist("Kids")) {
+    if (objnum == pNode->GetObjNum())
       return index;
-    }
-    if (skip_count) {
+
+    if (skip_count)
       skip_count--;
-    }
+
     index++;
+    return -1;
+  }
+
+  CPDF_Array* pKidList = pNode->GetArrayBy("Kids");
+  if (!pKidList)
+    return -1;
+
+  if (level >= FX_MAX_PAGE_LEVEL)
+    return -1;
+
+  size_t count = pNode->GetIntegerBy("Count");
+  if (count <= skip_count) {
+    skip_count -= count;
+    index += count;
+    return -1;
+  }
+
+  if (count && count == pKidList->GetCount()) {
+    for (size_t i = 0; i < count; i++) {
+      if (CPDF_Reference* pKid = ToReference(pKidList->GetObjectAt(i))) {
+        if (pKid->GetRefObjNum() == objnum) {
+          m_PageList.SetAt(index + i, objnum);
+          return static_cast<int>(index + i);
+        }
+      }
+    }
+  }
+
+  for (size_t i = 0; i < pKidList->GetCount(); i++) {
+    CPDF_Dictionary* pKid = pKidList->GetDictAt(i);
+    if (!pKid || pKid == pNode)
+      continue;
+
+    int found_index = FindPageIndex(pKid, skip_count, objnum, index, level + 1);
+    if (found_index >= 0)
+      return found_index;
   }
   return -1;
 }
+
 int CPDF_Document::GetPageIndex(uint32_t objnum) {
   uint32_t nPages = m_PageList.GetSize();
   uint32_t skip_count = 0;
-  FX_BOOL bSkipped = FALSE;
+  bool bSkipped = false;
   for (uint32_t i = 0; i < nPages; i++) {
     uint32_t objnum1 = m_PageList.GetAt(i);
-    if (objnum1 == objnum) {
+    if (objnum1 == objnum)
       return i;
-    }
+
     if (!bSkipped && objnum1 == 0) {
       skip_count = i;
-      bSkipped = TRUE;
+      bSkipped = true;
     }
   }
   CPDF_Dictionary* pRoot = GetRoot();
-  if (!pRoot) {
+  if (!pRoot)
     return -1;
-  }
+
   CPDF_Dictionary* pPages = pRoot->GetDictBy("Pages");
-  if (!pPages) {
+  if (!pPages)
     return -1;
-  }
+
   int index = 0;
-  return _FindPageIndex(pPages, skip_count, objnum, index);
+  return FindPageIndex(pPages, skip_count, objnum, index);
 }
+
 int CPDF_Document::GetPageCount() const {
   return m_PageList.GetSize();
 }
 
 int CPDF_Document::RetrievePageCount() const {
   CPDF_Dictionary* pRoot = GetRoot();
-  if (!pRoot) {
+  if (!pRoot)
     return 0;
-  }
+
   CPDF_Dictionary* pPages = pRoot->GetDictBy("Pages");
-  if (!pPages) {
+  if (!pPages)
     return 0;
-  }
-  if (!pPages->KeyExist("Kids")) {
+
+  if (!pPages->KeyExist("Kids"))
     return 1;
-  }
+
   std::set<CPDF_Dictionary*> visited_pages;
   visited_pages.insert(pPages);
   return CountPages(pPages, &visited_pages);
 }
 
 uint32_t CPDF_Document::GetUserPermissions(FX_BOOL bCheckRevision) const {
-  if (!m_pParser) {
-    return (uint32_t)-1;
-  }
-  return m_pParser->GetPermissions(bCheckRevision);
+  return m_pParser ? m_pParser->GetPermissions(bCheckRevision)
+                   : static_cast<uint32_t>(-1);
 }
 
 FX_BOOL CPDF_Document::IsFormStream(uint32_t objnum, FX_BOOL& bForm) const {
@@ -341,21 +737,712 @@ FX_BOOL CPDF_Document::IsFormStream(uint32_t objnum, FX_BOOL& bForm) const {
   return m_pParser->IsFormStream(objnum, bForm);
 }
 
+CPDF_Font* CPDF_Document::LoadFont(CPDF_Dictionary* pFontDict) {
+  ASSERT(pFontDict);
+  return m_pDocPage->GetFont(pFontDict, FALSE);
+}
+
+CPDF_StreamAcc* CPDF_Document::LoadFontFile(CPDF_Stream* pStream) {
+  return m_pDocPage->GetFontFileStreamAcc(pStream);
+}
+
+CPDF_ColorSpace* CPDF_Document::LoadColorSpace(CPDF_Object* pCSObj,
+                                               CPDF_Dictionary* pResources) {
+  return m_pDocPage->GetColorSpace(pCSObj, pResources);
+}
+
+CPDF_Pattern* CPDF_Document::LoadPattern(CPDF_Object* pPatternObj,
+                                         FX_BOOL bShading,
+                                         const CFX_Matrix* matrix) {
+  return m_pDocPage->GetPattern(pPatternObj, bShading, matrix);
+}
+
+CPDF_IccProfile* CPDF_Document::LoadIccProfile(CPDF_Stream* pStream) {
+  return m_pDocPage->GetIccProfile(pStream);
+}
+
+CPDF_Image* CPDF_Document::LoadImageF(CPDF_Object* pObj) {
+  if (!pObj)
+    return nullptr;
+
+  FXSYS_assert(pObj->GetObjNum());
+  return m_pDocPage->GetImage(pObj);
+}
+
+void CPDF_Document::RemoveColorSpaceFromPageData(CPDF_Object* pCSObj) {
+  if (pCSObj)
+    GetPageData()->ReleaseColorSpace(pCSObj);
+}
+
 void CPDF_Document::ClearPageData() {
-  if (m_pDocPage)
-    this->GetPageData()->Clear(FALSE);
+  GetPageData()->Clear(FALSE);
 }
 
 void CPDF_Document::ClearRenderData() {
-  if (m_pDocRender)
-    m_pDocRender->Clear(FALSE);
+  m_pDocRender->Clear(FALSE);
 }
 
 void CPDF_Document::ClearRenderFont() {
-  if (!m_pDocRender)
-    return;
-
   CFX_FontCache* pCache = m_pDocRender->GetFontCache();
   if (pCache)
     pCache->FreeCache(FALSE);
 }
+
+void CPDF_Document::CreateNewDoc() {
+  ASSERT(!m_pRootDict && !m_pInfoDict);
+  m_pRootDict = new CPDF_Dictionary;
+  m_pRootDict->SetAtName("Type", "Catalog");
+  int objnum = AddIndirectObject(m_pRootDict);
+  CPDF_Dictionary* pPages = new CPDF_Dictionary;
+  pPages->SetAtName("Type", "Pages");
+  pPages->SetAtNumber("Count", 0);
+  pPages->SetAt("Kids", new CPDF_Array);
+  objnum = AddIndirectObject(pPages);
+  m_pRootDict->SetAtReference("Pages", this, objnum);
+  m_pInfoDict = new CPDF_Dictionary;
+  AddIndirectObject(m_pInfoDict);
+}
+
+CPDF_Dictionary* CPDF_Document::CreateNewPage(int iPage) {
+  CPDF_Dictionary* pDict = new CPDF_Dictionary;
+  pDict->SetAtName("Type", "Page");
+  uint32_t dwObjNum = AddIndirectObject(pDict);
+  if (InsertNewPage(this, iPage, pDict, m_PageList) < 0) {
+    ReleaseIndirectObject(dwObjNum);
+    return nullptr;
+  }
+  return pDict;
+}
+
+void CPDF_Document::DeletePage(int iPage) {
+  CPDF_Dictionary* pRoot = GetRoot();
+  if (!pRoot)
+    return;
+
+  CPDF_Dictionary* pPages = pRoot->GetDictBy("Pages");
+  if (!pPages)
+    return;
+
+  int nPages = pPages->GetIntegerBy("Count");
+  if (iPage < 0 || iPage >= nPages)
+    return;
+
+  std::set<CPDF_Dictionary*> stack = {pPages};
+  if (InsertDeletePDFPage(this, pPages, iPage, nullptr, FALSE, &stack) < 0)
+    return;
+
+  m_PageList.RemoveAt(iPage);
+}
+
+CPDF_Font* CPDF_Document::AddStandardFont(const FX_CHAR* font,
+                                          CPDF_FontEncoding* pEncoding) {
+  CFX_ByteString name(font);
+  if (PDF_GetStandardFontName(&name) < 0)
+    return nullptr;
+  return GetPageData()->GetStandardFont(name.AsStringC(), pEncoding);
+}
+
+CPDF_Font* CPDF_Document::AddFont(CFX_Font* pFont, int charset, FX_BOOL bVert) {
+  if (!pFont)
+    return nullptr;
+
+  bool bCJK = charset == FXFONT_CHINESEBIG5_CHARSET ||
+              charset == FXFONT_GB2312_CHARSET ||
+              charset == FXFONT_HANGEUL_CHARSET ||
+              charset == FXFONT_SHIFTJIS_CHARSET;
+  CFX_ByteString basefont = pFont->GetFamilyName();
+  basefont.Replace(" ", "");
+  int flags = 0;
+  if (pFont->IsBold())
+    flags |= PDFFONT_FORCEBOLD;
+  if (pFont->IsItalic())
+    flags |= PDFFONT_ITALIC;
+  if (pFont->IsFixedWidth())
+    flags |= PDFFONT_FIXEDPITCH;
+
+  CPDF_Dictionary* pBaseDict = new CPDF_Dictionary;
+  pBaseDict->SetAtName("Type", "Font");
+  std::unique_ptr<CFX_UnicodeEncoding> pEncoding(
+      new CFX_UnicodeEncoding(pFont));
+  CPDF_Dictionary* pFontDict = pBaseDict;
+  if (!bCJK) {
+    CPDF_Array* pWidths = new CPDF_Array;
+    for (int charcode = 32; charcode < 128; charcode++) {
+      int glyph_index = pEncoding->GlyphFromCharCode(charcode);
+      int char_width = pFont->GetGlyphWidth(glyph_index);
+      pWidths->AddInteger(char_width);
+    }
+    if (charset == FXFONT_ANSI_CHARSET || charset == FXFONT_DEFAULT_CHARSET ||
+        charset == FXFONT_SYMBOL_CHARSET) {
+      if (charset == FXFONT_SYMBOL_CHARSET) {
+        flags |= PDFFONT_SYMBOLIC;
+      } else {
+        flags |= PDFFONT_NONSYMBOLIC;
+      }
+      pBaseDict->SetAtName("Encoding", "WinAnsiEncoding");
+      for (int charcode = 128; charcode <= 255; charcode++) {
+        int glyph_index = pEncoding->GlyphFromCharCode(charcode);
+        int char_width = pFont->GetGlyphWidth(glyph_index);
+        pWidths->AddInteger(char_width);
+      }
+    } else {
+      flags |= PDFFONT_NONSYMBOLIC;
+      size_t i;
+      for (i = 0; i < FX_ArraySize(g_FX_CharsetUnicodes); ++i) {
+        if (g_FX_CharsetUnicodes[i].m_Charset == charset)
+          break;
+      }
+      if (i < FX_ArraySize(g_FX_CharsetUnicodes)) {
+        CPDF_Dictionary* pEncodingDict = new CPDF_Dictionary;
+        pEncodingDict->SetAtName("BaseEncoding", "WinAnsiEncoding");
+        CPDF_Array* pArray = new CPDF_Array;
+        pArray->AddInteger(128);
+        const uint16_t* pUnicodes = g_FX_CharsetUnicodes[i].m_pUnicodes;
+        for (int j = 0; j < 128; j++) {
+          CFX_ByteString name = PDF_AdobeNameFromUnicode(pUnicodes[j]);
+          pArray->AddName(name.IsEmpty() ? ".notdef" : name);
+          int glyph_index = pEncoding->GlyphFromCharCode(pUnicodes[j]);
+          int char_width = pFont->GetGlyphWidth(glyph_index);
+          pWidths->AddInteger(char_width);
+        }
+        pEncodingDict->SetAt("Differences", pArray);
+        AddIndirectObject(pEncodingDict);
+        pBaseDict->SetAtReference("Encoding", this, pEncodingDict);
+      }
+    }
+    if (pFont->IsBold() && pFont->IsItalic())
+      basefont += ",BoldItalic";
+    else if (pFont->IsBold())
+      basefont += ",Bold";
+    else if (pFont->IsItalic())
+      basefont += ",Italic";
+
+    pBaseDict->SetAtName("Subtype", "TrueType");
+    pBaseDict->SetAtName("BaseFont", basefont);
+    pBaseDict->SetAtNumber("FirstChar", 32);
+    pBaseDict->SetAtNumber("LastChar", 255);
+    pBaseDict->SetAt("Widths", pWidths);
+  } else {
+    flags |= PDFFONT_NONSYMBOLIC;
+    pFontDict = new CPDF_Dictionary;
+    CFX_ByteString cmap;
+    CFX_ByteString ordering;
+    int supplement = 0;
+    CPDF_Array* pWidthArray = new CPDF_Array;
+    switch (charset) {
+      case FXFONT_CHINESEBIG5_CHARSET:
+        cmap = bVert ? "ETenms-B5-V" : "ETenms-B5-H";
+        ordering = "CNS1";
+        supplement = 4;
+        pWidthArray->AddInteger(1);
+        InsertWidthArray1(pFont, pEncoding.get(), 0x20, 0x7e, pWidthArray);
+        break;
+      case FXFONT_GB2312_CHARSET:
+        cmap = bVert ? "GBK-EUC-V" : "GBK-EUC-H";
+        ordering = "GB1";
+        supplement = 2;
+        pWidthArray->AddInteger(7716);
+        InsertWidthArray1(pFont, pEncoding.get(), 0x20, 0x20, pWidthArray);
+        pWidthArray->AddInteger(814);
+        InsertWidthArray1(pFont, pEncoding.get(), 0x21, 0x7e, pWidthArray);
+        break;
+      case FXFONT_HANGEUL_CHARSET:
+        cmap = bVert ? "KSCms-UHC-V" : "KSCms-UHC-H";
+        ordering = "Korea1";
+        supplement = 2;
+        pWidthArray->AddInteger(1);
+        InsertWidthArray1(pFont, pEncoding.get(), 0x20, 0x7e, pWidthArray);
+        break;
+      case FXFONT_SHIFTJIS_CHARSET:
+        cmap = bVert ? "90ms-RKSJ-V" : "90ms-RKSJ-H";
+        ordering = "Japan1";
+        supplement = 5;
+        pWidthArray->AddInteger(231);
+        InsertWidthArray1(pFont, pEncoding.get(), 0x20, 0x7d, pWidthArray);
+        pWidthArray->AddInteger(326);
+        InsertWidthArray1(pFont, pEncoding.get(), 0xa0, 0xa0, pWidthArray);
+        pWidthArray->AddInteger(327);
+        InsertWidthArray1(pFont, pEncoding.get(), 0xa1, 0xdf, pWidthArray);
+        pWidthArray->AddInteger(631);
+        InsertWidthArray1(pFont, pEncoding.get(), 0x7e, 0x7e, pWidthArray);
+        break;
+    }
+    pBaseDict->SetAtName("Subtype", "Type0");
+    pBaseDict->SetAtName("BaseFont", basefont);
+    pBaseDict->SetAtName("Encoding", cmap);
+    pFontDict->SetAt("W", pWidthArray);
+    pFontDict->SetAtName("Type", "Font");
+    pFontDict->SetAtName("Subtype", "CIDFontType2");
+    pFontDict->SetAtName("BaseFont", basefont);
+    CPDF_Dictionary* pCIDSysInfo = new CPDF_Dictionary;
+    pCIDSysInfo->SetAtString("Registry", "Adobe");
+    pCIDSysInfo->SetAtString("Ordering", ordering);
+    pCIDSysInfo->SetAtInteger("Supplement", supplement);
+    pFontDict->SetAt("CIDSystemInfo", pCIDSysInfo);
+    CPDF_Array* pArray = new CPDF_Array;
+    pBaseDict->SetAt("DescendantFonts", pArray);
+    AddIndirectObject(pFontDict);
+    pArray->AddReference(this, pFontDict);
+  }
+  AddIndirectObject(pBaseDict);
+  CPDF_Dictionary* pFontDesc = new CPDF_Dictionary;
+  pFontDesc->SetAtName("Type", "FontDescriptor");
+  pFontDesc->SetAtName("FontName", basefont);
+  pFontDesc->SetAtInteger("Flags", flags);
+  pFontDesc->SetAtInteger(
+      "ItalicAngle",
+      pFont->GetSubstFont() ? pFont->GetSubstFont()->m_ItalicAngle : 0);
+  pFontDesc->SetAtInteger("Ascent", pFont->GetAscent());
+  pFontDesc->SetAtInteger("Descent", pFont->GetDescent());
+  FX_RECT bbox;
+  pFont->GetBBox(bbox);
+  CPDF_Array* pBBox = new CPDF_Array;
+  pBBox->AddInteger(bbox.left);
+  pBBox->AddInteger(bbox.bottom);
+  pBBox->AddInteger(bbox.right);
+  pBBox->AddInteger(bbox.top);
+  pFontDesc->SetAt("FontBBox", pBBox);
+  int32_t nStemV = 0;
+  if (pFont->GetSubstFont()) {
+    nStemV = pFont->GetSubstFont()->m_Weight / 5;
+  } else {
+    static const FX_CHAR stem_chars[] = {'i', 'I', '!', '1'};
+    const size_t count = FX_ArraySize(stem_chars);
+    uint32_t glyph = pEncoding->GlyphFromCharCode(stem_chars[0]);
+    nStemV = pFont->GetGlyphWidth(glyph);
+    for (size_t i = 1; i < count; i++) {
+      glyph = pEncoding->GlyphFromCharCode(stem_chars[i]);
+      int width = pFont->GetGlyphWidth(glyph);
+      if (width > 0 && width < nStemV) {
+        nStemV = width;
+      }
+    }
+  }
+  pFontDesc->SetAtInteger("StemV", nStemV);
+  AddIndirectObject(pFontDesc);
+  pFontDict->SetAtReference("FontDescriptor", this, pFontDesc);
+  return LoadFont(pBaseDict);
+}
+
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+CPDF_Font* CPDF_Document::AddWindowsFont(LOGFONTW* pLogFont,
+                                         FX_BOOL bVert,
+                                         FX_BOOL bTranslateName) {
+  LOGFONTA lfa;
+  FXSYS_memcpy(&lfa, pLogFont, (char*)lfa.lfFaceName - (char*)&lfa);
+  CFX_ByteString face = CFX_ByteString::FromUnicode(pLogFont->lfFaceName);
+  if (face.GetLength() >= LF_FACESIZE)
+    return nullptr;
+
+  FXSYS_strcpy(lfa.lfFaceName, face.c_str());
+  return AddWindowsFont(&lfa, bVert, bTranslateName);
+}
+
+CPDF_Font* CPDF_Document::AddWindowsFont(LOGFONTA* pLogFont,
+                                         FX_BOOL bVert,
+                                         FX_BOOL bTranslateName) {
+  pLogFont->lfHeight = -1000;
+  pLogFont->lfWidth = 0;
+  HGDIOBJ hFont = CreateFontIndirectA(pLogFont);
+  HDC hDC = CreateCompatibleDC(nullptr);
+  hFont = SelectObject(hDC, hFont);
+  int tm_size = GetOutlineTextMetrics(hDC, 0, nullptr);
+  if (tm_size == 0) {
+    hFont = SelectObject(hDC, hFont);
+    DeleteObject(hFont);
+    DeleteDC(hDC);
+    return nullptr;
+  }
+
+  LPBYTE tm_buf = FX_Alloc(BYTE, tm_size);
+  OUTLINETEXTMETRIC* ptm = (OUTLINETEXTMETRIC*)tm_buf;
+  GetOutlineTextMetrics(hDC, tm_size, ptm);
+  int flags = 0, italicangle, ascend, descend, capheight, bbox[4];
+  if (pLogFont->lfItalic)
+    flags |= PDFFONT_ITALIC;
+  if ((pLogFont->lfPitchAndFamily & 3) == FIXED_PITCH)
+    flags |= PDFFONT_FIXEDPITCH;
+  if ((pLogFont->lfPitchAndFamily & 0xf8) == FF_ROMAN)
+    flags |= PDFFONT_SERIF;
+  if ((pLogFont->lfPitchAndFamily & 0xf8) == FF_SCRIPT)
+    flags |= PDFFONT_SCRIPT;
+
+  bool bCJK = pLogFont->lfCharSet == CHINESEBIG5_CHARSET ||
+              pLogFont->lfCharSet == GB2312_CHARSET ||
+              pLogFont->lfCharSet == HANGEUL_CHARSET ||
+              pLogFont->lfCharSet == SHIFTJIS_CHARSET;
+  CFX_ByteString basefont;
+  if (bTranslateName && bCJK)
+    basefont = FPDF_GetPSNameFromTT(hDC);
+
+  if (basefont.IsEmpty())
+    basefont = pLogFont->lfFaceName;
+
+  italicangle = ptm->otmItalicAngle / 10;
+  ascend = ptm->otmrcFontBox.top;
+  descend = ptm->otmrcFontBox.bottom;
+  capheight = ptm->otmsCapEmHeight;
+  bbox[0] = ptm->otmrcFontBox.left;
+  bbox[1] = ptm->otmrcFontBox.bottom;
+  bbox[2] = ptm->otmrcFontBox.right;
+  bbox[3] = ptm->otmrcFontBox.top;
+  FX_Free(tm_buf);
+  basefont.Replace(" ", "");
+  CPDF_Dictionary* pBaseDict = new CPDF_Dictionary;
+  pBaseDict->SetAtName("Type", "Font");
+  CPDF_Dictionary* pFontDict = pBaseDict;
+  if (!bCJK) {
+    if (pLogFont->lfCharSet == ANSI_CHARSET ||
+        pLogFont->lfCharSet == DEFAULT_CHARSET ||
+        pLogFont->lfCharSet == SYMBOL_CHARSET) {
+      if (pLogFont->lfCharSet == SYMBOL_CHARSET)
+        flags |= PDFFONT_SYMBOLIC;
+      else
+        flags |= PDFFONT_NONSYMBOLIC;
+      pBaseDict->SetAtName("Encoding", "WinAnsiEncoding");
+    } else {
+      flags |= PDFFONT_NONSYMBOLIC;
+      int i;
+      for (i = 0; i < FX_ArraySize(g_FX_CharsetUnicodes); ++i) {
+        if (g_FX_CharsetUnicodes[i].m_Charset == pLogFont->lfCharSet)
+          break;
+      }
+      if (i < FX_ArraySize(g_FX_CharsetUnicodes)) {
+        CPDF_Dictionary* pEncoding = new CPDF_Dictionary;
+        pEncoding->SetAtName("BaseEncoding", "WinAnsiEncoding");
+        CPDF_Array* pArray = new CPDF_Array;
+        pArray->AddInteger(128);
+        const uint16_t* pUnicodes = g_FX_CharsetUnicodes[i].m_pUnicodes;
+        for (int j = 0; j < 128; j++) {
+          CFX_ByteString name = PDF_AdobeNameFromUnicode(pUnicodes[j]);
+          pArray->AddName(name.IsEmpty() ? ".notdef" : name);
+        }
+        pEncoding->SetAt("Differences", pArray);
+        AddIndirectObject(pEncoding);
+        pBaseDict->SetAtReference("Encoding", this, pEncoding);
+      }
+    }
+    if (pLogFont->lfWeight > FW_MEDIUM && pLogFont->lfItalic)
+      basefont += ",BoldItalic";
+    else if (pLogFont->lfWeight > FW_MEDIUM)
+      basefont += ",Bold";
+    else if (pLogFont->lfItalic)
+      basefont += ",Italic";
+
+    pBaseDict->SetAtName("Subtype", "TrueType");
+    pBaseDict->SetAtName("BaseFont", basefont);
+    pBaseDict->SetAtNumber("FirstChar", 32);
+    pBaseDict->SetAtNumber("LastChar", 255);
+    int char_widths[224];
+    GetCharWidth(hDC, 32, 255, char_widths);
+    CPDF_Array* pWidths = new CPDF_Array;
+    for (int i = 0; i < 224; i++)
+      pWidths->AddInteger(char_widths[i]);
+
+    pBaseDict->SetAt("Widths", pWidths);
+  } else {
+    flags |= PDFFONT_NONSYMBOLIC;
+    pFontDict = new CPDF_Dictionary;
+    CFX_ByteString cmap;
+    CFX_ByteString ordering;
+    int supplement = 0;
+    CPDF_Array* pWidthArray = new CPDF_Array;
+    switch (pLogFont->lfCharSet) {
+      case CHINESEBIG5_CHARSET:
+        cmap = bVert ? "ETenms-B5-V" : "ETenms-B5-H";
+        ordering = "CNS1";
+        supplement = 4;
+        pWidthArray->AddInteger(1);
+        InsertWidthArray(hDC, 0x20, 0x7e, pWidthArray);
+        break;
+      case GB2312_CHARSET:
+        cmap = bVert ? "GBK-EUC-V" : "GBK-EUC-H";
+        ordering = "GB1", supplement = 2;
+        pWidthArray->AddInteger(7716);
+        InsertWidthArray(hDC, 0x20, 0x20, pWidthArray);
+        pWidthArray->AddInteger(814);
+        InsertWidthArray(hDC, 0x21, 0x7e, pWidthArray);
+        break;
+      case HANGEUL_CHARSET:
+        cmap = bVert ? "KSCms-UHC-V" : "KSCms-UHC-H";
+        ordering = "Korea1";
+        supplement = 2;
+        pWidthArray->AddInteger(1);
+        InsertWidthArray(hDC, 0x20, 0x7e, pWidthArray);
+        break;
+      case SHIFTJIS_CHARSET:
+        cmap = bVert ? "90ms-RKSJ-V" : "90ms-RKSJ-H";
+        ordering = "Japan1";
+        supplement = 5;
+        pWidthArray->AddInteger(231);
+        InsertWidthArray(hDC, 0x20, 0x7d, pWidthArray);
+        pWidthArray->AddInteger(326);
+        InsertWidthArray(hDC, 0xa0, 0xa0, pWidthArray);
+        pWidthArray->AddInteger(327);
+        InsertWidthArray(hDC, 0xa1, 0xdf, pWidthArray);
+        pWidthArray->AddInteger(631);
+        InsertWidthArray(hDC, 0x7e, 0x7e, pWidthArray);
+        break;
+    }
+    pBaseDict->SetAtName("Subtype", "Type0");
+    pBaseDict->SetAtName("BaseFont", basefont);
+    pBaseDict->SetAtName("Encoding", cmap);
+    pFontDict->SetAt("W", pWidthArray);
+    pFontDict->SetAtName("Type", "Font");
+    pFontDict->SetAtName("Subtype", "CIDFontType2");
+    pFontDict->SetAtName("BaseFont", basefont);
+    CPDF_Dictionary* pCIDSysInfo = new CPDF_Dictionary;
+    pCIDSysInfo->SetAtString("Registry", "Adobe");
+    pCIDSysInfo->SetAtString("Ordering", ordering);
+    pCIDSysInfo->SetAtInteger("Supplement", supplement);
+    pFontDict->SetAt("CIDSystemInfo", pCIDSysInfo);
+    CPDF_Array* pArray = new CPDF_Array;
+    pBaseDict->SetAt("DescendantFonts", pArray);
+    AddIndirectObject(pFontDict);
+    pArray->AddReference(this, pFontDict);
+  }
+  AddIndirectObject(pBaseDict);
+  CPDF_Dictionary* pFontDesc = new CPDF_Dictionary;
+  pFontDesc->SetAtName("Type", "FontDescriptor");
+  pFontDesc->SetAtName("FontName", basefont);
+  pFontDesc->SetAtInteger("Flags", flags);
+  CPDF_Array* pBBox = new CPDF_Array;
+  for (int i = 0; i < 4; i++) {
+    pBBox->AddInteger(bbox[i]);
+  }
+  pFontDesc->SetAt("FontBBox", pBBox);
+  pFontDesc->SetAtInteger("ItalicAngle", italicangle);
+  pFontDesc->SetAtInteger("Ascent", ascend);
+  pFontDesc->SetAtInteger("Descent", descend);
+  pFontDesc->SetAtInteger("CapHeight", capheight);
+  pFontDesc->SetAtInteger("StemV", pLogFont->lfWeight / 5);
+  AddIndirectObject(pFontDesc);
+  pFontDict->SetAtReference("FontDescriptor", this, pFontDesc);
+  hFont = SelectObject(hDC, hFont);
+  DeleteObject(hFont);
+  DeleteDC(hDC);
+  return LoadFont(pBaseDict);
+}
+#endif  //  _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+CPDF_Font* CPDF_Document::AddMacFont(CTFontRef pFont,
+                                     FX_BOOL bVert,
+                                     FX_BOOL bTranslateName) {
+  CTFontRef font = (CTFontRef)pFont;
+  CTFontDescriptorRef descriptor = CTFontCopyFontDescriptor(font);
+  if (!descriptor)
+    return nullptr;
+
+  CFArrayRef languages = (CFArrayRef)CTFontDescriptorCopyAttribute(
+      descriptor, kCTFontLanguagesAttribute);
+  if (!languages) {
+    CFRelease(descriptor);
+    return nullptr;
+  }
+
+  bool bCJK =
+      HasCharSet(languages, {FXFONT_CHINESEBIG5_CHARSET, FXFONT_GB2312_CHARSET,
+                             FXFONT_HANGEUL_CHARSET, FXFONT_SHIFTJIS_CHARSET});
+  CFRelease(descriptor);
+  CFDictionaryRef traits = (CFDictionaryRef)CTFontCopyTraits(font);
+  if (!traits) {
+    CFRelease(languages);
+    return nullptr;
+  }
+
+  CFNumberRef sybolicTrait =
+      (CFNumberRef)CFDictionaryGetValue(traits, kCTFontSymbolicTrait);
+  CTFontSymbolicTraits trait = 0;
+  CFNumberGetValue(sybolicTrait, kCFNumberSInt32Type, &trait);
+  int flags = 0;
+  if (trait & kCTFontItalicTrait)
+    flags |= PDFFONT_ITALIC;
+  if (trait & kCTFontMonoSpaceTrait)
+    flags |= PDFFONT_FIXEDPITCH;
+  if (trait & kCTFontModernSerifsClass)
+    flags |= PDFFONT_SERIF;
+  if (trait & kCTFontScriptsClass)
+    flags |= PDFFONT_SCRIPT;
+
+  CFNumberRef weightTrait =
+      (CFNumberRef)CFDictionaryGetValue(traits, kCTFontWeightTrait);
+  Float32 weight = 0;
+  CFNumberGetValue(weightTrait, kCFNumberFloat32Type, &weight);
+  int italicangle = CTFontGetSlantAngle(font);
+  int ascend = CTFontGetAscent(font);
+  int descend = CTFontGetDescent(font);
+  int capheight = CTFontGetCapHeight(font);
+  CGRect box = CTFontGetBoundingBox(font);
+  int bbox[4];
+  bbox[0] = box.origin.x;
+  bbox[1] = box.origin.y;
+  bbox[2] = box.origin.x + box.size.width;
+  bbox[3] = box.origin.y + box.size.height;
+  CFX_ByteString basefont;
+  if (bTranslateName && bCJK) {
+    CFStringRef postName = CTFontCopyPostScriptName(font);
+    CFString2CFXByteString(postName, basefont);
+    CFRelease(postName);
+  }
+  if (basefont.IsEmpty()) {
+    CFStringRef fullName = CTFontCopyFullName(font);
+    CFString2CFXByteString(fullName, basefont);
+    CFRelease(fullName);
+  }
+  basefont.Replace(" ", "");
+  CPDF_Dictionary* pBaseDict = new CPDF_Dictionary;
+  CPDF_Dictionary* pFontDict = pBaseDict;
+  if (!bCJK) {
+    if (HasCharSet(languages, {FXFONT_ANSI_CHARSET, FXFONT_DEFAULT_CHARSET,
+                               FXFONT_SYMBOL_CHARSET})) {
+      if (HasCharSet(languages, {FXFONT_SYMBOL_CHARSET})) {
+        flags |= PDFFONT_SYMBOLIC;
+      } else {
+        flags |= PDFFONT_NONSYMBOLIC;
+      }
+      pBaseDict->SetAtName("Encoding", "WinAnsiEncoding");
+    } else {
+      flags |= PDFFONT_NONSYMBOLIC;
+      size_t i;
+      for (i = 0; i < FX_ArraySize(g_FX_CharsetUnicodes); ++i) {
+        if (HasCharSet(languages, {g_FX_CharsetUnicodes[i].m_Charset}))
+          break;
+      }
+      if (i < FX_ArraySize(g_FX_CharsetUnicodes)) {
+        CPDF_Dictionary* pEncoding = new CPDF_Dictionary;
+        pEncoding->SetAtName("BaseEncoding", "WinAnsiEncoding");
+        CPDF_Array* pArray = new CPDF_Array;
+        pArray->AddInteger(128);
+        const uint16_t* pUnicodes = g_FX_CharsetUnicodes[i].m_pUnicodes;
+        for (int j = 0; j < 128; j++) {
+          CFX_ByteString name = PDF_AdobeNameFromUnicode(pUnicodes[j]);
+          pArray->AddName(name.IsEmpty() ? ".notdef" : name);
+        }
+        pEncoding->SetAt("Differences", pArray);
+        AddIndirectObject(pEncoding);
+        pBaseDict->SetAtReference("Encoding", this, pEncoding);
+      }
+    }
+    if (weight > 0.0 && trait & kCTFontItalicTrait)
+      basefont += ",BoldItalic";
+    else if (weight > 0.0)
+      basefont += ",Bold";
+    else if (trait & kCTFontItalicTrait)
+      basefont += ",Italic";
+
+    pBaseDict->SetAtName("Subtype", "TrueType");
+    pBaseDict->SetAtName("BaseFont", basefont);
+    pBaseDict->SetAtNumber("FirstChar", 32);
+    pBaseDict->SetAtNumber("LastChar", 255);
+    int char_widths[224];
+    FX_GetCharWidth(font, 32, 255, char_widths);
+    CPDF_Array* pWidths = new CPDF_Array;
+    for (int i = 0; i < 224; i++)
+      pWidths->AddInteger(char_widths[i]);
+    pBaseDict->SetAt("Widths", pWidths);
+  } else {
+    flags |= PDFFONT_NONSYMBOLIC;
+    CFX_ByteString cmap;
+    CFX_ByteString ordering;
+    int supplement;
+    bool bFound = false;
+    CPDF_Array* pWidthArray = new CPDF_Array;
+    if (HasCharSet(languages, {FXFONT_CHINESEBIG5_CHARSET})) {
+      cmap = bVert ? "ETenms-B5-V" : "ETenms-B5-H";
+      ordering = "CNS1";
+      supplement = 4;
+      pWidthArray->AddInteger(1);
+      InsertWidthArray(font, 0x20, 0x7e, pWidthArray);
+      bFound = true;
+    }
+    if (!bFound && HasCharSet(languages, {FXFONT_GB2312_CHARSET})) {
+      cmap = bVert ? "GBK-EUC-V" : "GBK-EUC-H";
+      ordering = "GB1", supplement = 2;
+      pWidthArray->AddInteger(7716);
+      InsertWidthArray(font, 0x20, 0x20, pWidthArray);
+      pWidthArray->AddInteger(814);
+      InsertWidthArray(font, 0x21, 0x7e, pWidthArray);
+      bFound = true;
+    }
+    if (!bFound && HasCharSet(languages, {FXFONT_HANGEUL_CHARSET})) {
+      cmap = bVert ? "KSCms-UHC-V" : "KSCms-UHC-H";
+      ordering = "Korea1";
+      supplement = 2;
+      pWidthArray->AddInteger(1);
+      InsertWidthArray(font, 0x20, 0x7e, pWidthArray);
+      bFound = true;
+    }
+    if (!bFound && HasCharSet(languages, {FXFONT_SHIFTJIS_CHARSET})) {
+      cmap = bVert ? "90ms-RKSJ-V" : "90ms-RKSJ-H";
+      ordering = "Japan1";
+      supplement = 5;
+      pWidthArray->AddInteger(231);
+      InsertWidthArray(font, 0x20, 0x7d, pWidthArray);
+      pWidthArray->AddInteger(326);
+      InsertWidthArray(font, 0xa0, 0xa0, pWidthArray);
+      pWidthArray->AddInteger(327);
+      InsertWidthArray(font, 0xa1, 0xdf, pWidthArray);
+      pWidthArray->AddInteger(631);
+      InsertWidthArray(font, 0x7e, 0x7e, pWidthArray);
+    }
+    pBaseDict->SetAtName("Subtype", "Type0");
+    pBaseDict->SetAtName("BaseFont", basefont);
+    pBaseDict->SetAtName("Encoding", cmap);
+
+    pFontDict = new CPDF_Dictionary;
+    pFontDict->SetAt("W", pWidthArray);
+    pFontDict->SetAtName("Type", "Font");
+    pFontDict->SetAtName("Subtype", "CIDFontType2");
+    pFontDict->SetAtName("BaseFont", basefont);
+    CPDF_Dictionary* pCIDSysInfo = new CPDF_Dictionary;
+    pCIDSysInfo->SetAtString("Registry", "Adobe");
+    pCIDSysInfo->SetAtString("Ordering", ordering);
+    pCIDSysInfo->SetAtInteger("Supplement", supplement);
+    pFontDict->SetAt("CIDSystemInfo", pCIDSysInfo);
+    CPDF_Array* pArray = new CPDF_Array;
+    pBaseDict->SetAt("DescendantFonts", pArray);
+    AddIndirectObject(pFontDict);
+    pArray->AddReference(this, pFontDict);
+  }
+  AddIndirectObject(pBaseDict);
+  CPDF_Dictionary* pFontDesc = new CPDF_Dictionary;
+  pFontDesc->SetAtName("Type", "FontDescriptor");
+  pFontDesc->SetAtName("FontName", basefont);
+  pFontDesc->SetAtInteger("Flags", flags);
+  CPDF_Array* pBBox = new CPDF_Array;
+  for (int i = 0; i < 4; i++)
+    pBBox->AddInteger(bbox[i]);
+
+  pFontDesc->SetAt("FontBBox", pBBox);
+  pFontDesc->SetAtInteger("ItalicAngle", italicangle);
+  pFontDesc->SetAtInteger("Ascent", ascend);
+  pFontDesc->SetAtInteger("Descent", descend);
+  pFontDesc->SetAtInteger("CapHeight", capheight);
+  CGFloat fStemV = 0;
+  int16_t min_width = SHRT_MAX;
+
+  static const UniChar stem_chars[] = {'i', 'I', '!', '1'};
+  CGGlyph glyphs[FX_ArraySize(stem_chars)];
+  CGRect boundingRects[FX_ArraySize(stem_chars)];
+
+  const size_t count = FX_ArraySize(stem_chars);
+  if (CTFontGetGlyphsForCharacters(font, stem_chars, glyphs, count)) {
+    CTFontGetBoundingRectsForGlyphs(font, kCTFontHorizontalOrientation, glyphs,
+                                    boundingRects, count);
+    for (size_t i = 0; i < count; i++) {
+      int16_t width = boundingRects[i].size.width;
+      if (width > 0 && width < min_width) {
+        min_width = width;
+        fStemV = min_width;
+      }
+    }
+  }
+  pFontDesc->SetAtInteger("StemV", fStemV);
+  AddIndirectObject(pFontDesc);
+  pFontDict->SetAtReference("FontDescriptor", this, pFontDesc);
+  CFRelease(traits);
+  CFRelease(languages);
+  return LoadFont(pBaseDict);
+}
+#endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_document.h b/core/fpdfapi/fpdf_parser/include/cpdf_document.h
index bbccf59361..38c0fdda30 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_document.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_document.h
@@ -7,6 +7,8 @@
 #ifndef CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_DOCUMENT_H_
 #define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_DOCUMENT_H_
 
+#include <memory>
+
 #include "core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_object.h"
 #include "core/fxcrt/include/fx_basic.h"
@@ -35,7 +37,6 @@ class CPDF_StreamAcc;
 
 class CPDF_Document : public CFX_PrivateData, public CPDF_IndirectObjectHolder {
  public:
-  CPDF_Document();
   explicit CPDF_Document(CPDF_Parser* pParser);
   ~CPDF_Document();
 
@@ -52,11 +53,11 @@ class CPDF_Document : public CFX_PrivateData, public CPDF_IndirectObjectHolder {
   CPDF_Dictionary* GetPage(int iPage);
   int GetPageIndex(uint32_t objnum);
   uint32_t GetUserPermissions(FX_BOOL bCheckRevision = FALSE) const;
-  CPDF_DocPageData* GetPageData() { return GetValidatePageData(); }
+  CPDF_DocPageData* GetPageData() const { return m_pDocPage; }
   void ClearPageData();
   void RemoveColorSpaceFromPageData(CPDF_Object* pObject);
 
-  CPDF_DocRenderData* GetRenderData() { return GetValidateRenderData(); }
+  CPDF_DocRenderData* GetRenderData() const { return m_pDocRender.get(); }
   void ClearRenderData();
   void ClearRenderFont();
 
@@ -75,8 +76,17 @@ class CPDF_Document : public CFX_PrivateData, public CPDF_IndirectObjectHolder {
   CPDF_StreamAcc* LoadFontFile(CPDF_Stream* pStream);
   CPDF_IccProfile* LoadIccProfile(CPDF_Stream* pStream);
 
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+  void LoadDoc();
+  void LoadAsynDoc(CPDF_Dictionary* pLinearized);
+  void LoadPages();
 
+  // Editing methods.
+  void CreateNewDoc();
+  CPDF_Dictionary* CreateNewPage(int iPage);
+  void DeletePage(int iPage);
+  CPDF_Font* AddStandardFont(const FX_CHAR* font, CPDF_FontEncoding* pEncoding);
+  CPDF_Font* AddFont(CFX_Font* pFont, int charset, FX_BOOL bVert);
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
   CPDF_Font* AddWindowsFont(LOGFONTA* pLogFont,
                             FX_BOOL bVert,
                             FX_BOOL bTranslateName = FALSE);
@@ -90,48 +100,37 @@ class CPDF_Document : public CFX_PrivateData, public CPDF_IndirectObjectHolder {
                         FX_BOOL bTranslateName = FALSE);
 #endif
 
-  CPDF_Font* AddStandardFont(const FX_CHAR* font, CPDF_FontEncoding* pEncoding);
-  CPDF_Font* AddFont(CFX_Font* pFont, int charset, FX_BOOL bVert);
-  void CreateNewDoc();
-
-  CPDF_Dictionary* CreateNewPage(int iPage);
-  void DeletePage(int iPage);
-
-  void LoadDoc();
-  void LoadAsynDoc(CPDF_Dictionary* pLinearized);
-  void LoadPages();
-
  protected:
-  // Retrieve page count information by getting count value from the tree nodes
-  // or walking through the tree nodes to calculate it.
-  int RetrievePageCount() const;
-  CPDF_Dictionary* _FindPDFPage(CPDF_Dictionary* pPages,
-                                int iPage,
-                                int nPagesToGo,
-                                int level);
-  int _FindPageIndex(CPDF_Dictionary* pNode,
-                     uint32_t& skip_count,
-                     uint32_t objnum,
-                     int& index,
-                     int level = 0);
-  FX_BOOL CheckOCGVisible(CPDF_Dictionary* pOCG, FX_BOOL bPrinting);
-  CPDF_DocPageData* GetValidatePageData();
-  CPDF_DocRenderData* GetValidateRenderData();
   friend class CPDF_Creator;
   friend class CPDF_Parser;
   friend class CPDF_DataAvail;
   friend class CPDF_OCContext;
 
+  // Retrieve page count information by getting count value from the tree nodes
+  // or walking through the tree nodes to calculate it.
+  int RetrievePageCount() const;
+  CPDF_Dictionary* FindPDFPage(CPDF_Dictionary* pPages,
+                               int iPage,
+                               int nPagesToGo,
+                               int level);
+  int FindPageIndex(CPDF_Dictionary* pNode,
+                    uint32_t& skip_count,
+                    uint32_t objnum,
+                    int& index,
+                    int level = 0);
+  FX_BOOL CheckOCGVisible(CPDF_Dictionary* pOCG, FX_BOOL bPrinting);
+
   CPDF_Dictionary* m_pRootDict;
   CPDF_Dictionary* m_pInfoDict;
   CFX_ByteString m_ID1;
   CFX_ByteString m_ID2;
-  FX_BOOL m_bLinearized;
-  uint32_t m_dwFirstPageNo;
+  bool m_bLinearized;
+  int m_iFirstPageNo;
   uint32_t m_dwFirstPageObjNum;
   CFX_ArrayTemplate<uint32_t> m_PageList;
+  // TODO(thestig): Figure out why this cannot be a std::unique_ptr.
   CPDF_DocPageData* m_pDocPage;
-  CPDF_DocRenderData* m_pDocRender;
+  std::unique_ptr<CPDF_DocRenderData> m_pDocRender;
 };
 
 #endif  // CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_DOCUMENT_H_
diff --git a/fpdfsdk/fpdfdoc_unittest.cpp b/fpdfsdk/fpdfdoc_unittest.cpp
index a67e50cd52..eb04de6971 100644
--- a/fpdfsdk/fpdfdoc_unittest.cpp
+++ b/fpdfsdk/fpdfdoc_unittest.cpp
@@ -24,6 +24,8 @@
 
 class CPDF_TestDocument : public CPDF_Document {
  public:
+  CPDF_TestDocument() : CPDF_Document(nullptr) {}
+
   void SetRoot(CPDF_Dictionary* root) { m_pRootDict = root; }
   CPDF_IndirectObjectHolder* GetHolder() { return this; }
 };
diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp
index c4273fe64f..576d9fb778 100644
--- a/fpdfsdk/fpdfeditpage.cpp
+++ b/fpdfsdk/fpdfeditpage.cpp
@@ -36,7 +36,7 @@
 #endif
 
 DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_CreateNewDocument() {
-  CPDF_Document* pDoc = new CPDF_Document;
+  CPDF_Document* pDoc = new CPDF_Document(nullptr);
   pDoc->CreateNewDoc();
   time_t currentTime;
 
diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
index 96ca6ea2ff..62bb4079f2 100644
--- a/fpdfsdk/pdfwindow/PWL_FontMap.cpp
+++ b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
@@ -53,7 +53,7 @@ void CPWL_FontMap::SetSystemHandler(IFX_SystemHandler* pSystemHandler) {
 CPDF_Document* CPWL_FontMap::GetDocument() {
   if (!m_pPDFDoc) {
     if (CPDF_ModuleMgr::Get()) {
-      m_pPDFDoc = new CPDF_Document;
+      m_pPDFDoc = new CPDF_Document(nullptr);
       m_pPDFDoc->CreateNewDoc();
     }
   }
diff --git a/pdfium.gyp b/pdfium.gyp
index 5650014bd3..8b48e126a2 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -334,7 +334,6 @@
         'core/fpdfapi/fpdf_edit/editint.h',
         'core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp',
         'core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp',
-        'core/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp',
         'core/fpdfapi/fpdf_edit/include/cpdf_creator.h',
         'core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h',
         'core/fpdfapi/fpdf_font/cpdf_cidfont.cpp',