Move core/fpdfapi/fpdf_font to core/fpdfapi/font

BUG=pdfium:603

Review-Url: https://codereview.chromium.org/2392773003

core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp

diff --git a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
index 6351d2c..8d7fa4b 100644
--- a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
+++ b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
@@ -8,7 +8,7 @@
 
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
 

core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp

diff --git a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
index 9647eee..8c60b3b 100644
--- a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
+++ b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
@@ -8,7 +8,7 @@
 
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
 

core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp

diff --git a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
index f726d50..5336060 100644
--- a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
@@ -8,7 +8,7 @@
 
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
 

core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp

diff --git a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
index e8a0071..cc417bf 100644
--- a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
+++ b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
@@ -8,7 +8,7 @@
 
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
 

core/fpdfapi/cmaps/fpdf_cmaps.cpp

diff --git a/core/fpdfapi/cmaps/fpdf_cmaps.cpp b/core/fpdfapi/cmaps/fpdf_cmaps.cpp
index c85a7d9..58a1c08 100644
--- a/core/fpdfapi/cmaps/fpdf_cmaps.cpp
+++ b/core/fpdfapi/cmaps/fpdf_cmaps.cpp
@@ -7,7 +7,7 @@
 #include "core/fpdfapi/cmaps/cmap_int.h"
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 
 extern "C" {

core/fpdfapi/font/cpdf_cidfont.cpp

diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp
similarity index 99%
rename from core/fpdfapi/fpdf_font/cpdf_cidfont.cpp
rename to core/fpdfapi/font/cpdf_cidfont.cpp
index cb21d20..e5bbd80 100644
--- a/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp
+++ b/core/fpdfapi/font/cpdf_cidfont.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_cidfont.h"
+#include "core/fpdfapi/font/cpdf_cidfont.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
-#include "core/fpdfapi/fpdf_font/ttgsubtable.h"
+#include "core/fpdfapi/font/cpdf_fontencoding.h"
+#include "core/fpdfapi/font/font_int.h"
+#include "core/fpdfapi/font/ttgsubtable.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"

core/fpdfapi/font/cpdf_cidfont.h

diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.h b/core/fpdfapi/font/cpdf_cidfont.h
similarity index 93%
rename from core/fpdfapi/fpdf_font/cpdf_cidfont.h
rename to core/fpdfapi/font/cpdf_cidfont.h
index 3e8c042..0a6b3e7 100644
--- a/core/fpdfapi/fpdf_font/cpdf_cidfont.h
+++ b/core/fpdfapi/font/cpdf_cidfont.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_CIDFONT_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_CIDFONT_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_CIDFONT_H_
+#define CORE_FPDFAPI_FONT_CPDF_CIDFONT_H_
 
 #include <memory>
 
-#include "core/fpdfapi/fpdf_font/cpdf_font.h"
+#include "core/fpdfapi/font/cpdf_font.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 
@@ -88,4 +88,4 @@
   std::unique_ptr<CFX_CTTGSUBTable> m_pTTGSUBTable;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_CIDFONT_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_CIDFONT_H_

core/fpdfapi/font/cpdf_font.cpp

diff --git a/core/fpdfapi/fpdf_font/cpdf_font.cpp b/core/fpdfapi/font/cpdf_font.cpp
similarity index 97%
rename from core/fpdfapi/fpdf_font/cpdf_font.cpp
rename to core/fpdfapi/font/cpdf_font.cpp
index 96ebda7..945681f 100644
--- a/core/fpdfapi/fpdf_font/cpdf_font.cpp
+++ b/core/fpdfapi/font/cpdf_font.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_font.h"
+#include "core/fpdfapi/font/cpdf_font.h"
 
 #include <memory>
 #include <vector>
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
-#include "core/fpdfapi/fpdf_font/cpdf_truetypefont.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type1font.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/cpdf_fontencoding.h"
+#include "core/fpdfapi/font/cpdf_truetypefont.h"
+#include "core/fpdfapi/font/cpdf_type1font.h"
+#include "core/fpdfapi/font/cpdf_type3font.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"

core/fpdfapi/font/cpdf_font.h

diff --git a/core/fpdfapi/fpdf_font/cpdf_font.h b/core/fpdfapi/font/cpdf_font.h
similarity index 96%
rename from core/fpdfapi/fpdf_font/cpdf_font.h
rename to core/fpdfapi/font/cpdf_font.h
index 0d2f50b..244ab72 100644
--- a/core/fpdfapi/fpdf_font/cpdf_font.h
+++ b/core/fpdfapi/font/cpdf_font.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_FONT_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_FONT_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_FONT_H_
+#define CORE_FPDFAPI_FONT_CPDF_FONT_H_
 
 #include <memory>
 #include <vector>
@@ -129,4 +129,4 @@
   int m_ItalicAngle;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_FONT_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_FONT_H_

core/fpdfapi/font/cpdf_fontencoding.cpp

diff --git a/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp b/core/fpdfapi/font/cpdf_fontencoding.cpp
similarity index 99%
rename from core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
rename to core/fpdfapi/font/cpdf_fontencoding.cpp
index e373e01..f6c5186 100644
--- a/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
+++ b/core/fpdfapi/font/cpdf_fontencoding.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
+#include "core/fpdfapi/font/cpdf_fontencoding.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"

core/fpdfapi/font/cpdf_fontencoding.h

diff --git a/core/fpdfapi/fpdf_font/cpdf_fontencoding.h b/core/fpdfapi/font/cpdf_fontencoding.h
similarity index 91%
rename from core/fpdfapi/fpdf_font/cpdf_fontencoding.h
rename to core/fpdfapi/font/cpdf_fontencoding.h
index f8db9e5..a81035c 100644
--- a/core/fpdfapi/fpdf_font/cpdf_fontencoding.h
+++ b/core/fpdfapi/font/cpdf_fontencoding.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_FONTENCODING_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_FONTENCODING_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_FONTENCODING_H_
+#define CORE_FPDFAPI_FONT_CPDF_FONTENCODING_H_
 
 #include "core/fxcrt/cfx_string_pool_template.h"
 #include "core/fxcrt/cfx_weak_ptr.h"
@@ -58,4 +58,4 @@
   FX_WCHAR m_Unicodes[256];
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_FONTENCODING_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_FONTENCODING_H_

core/fpdfapi/font/cpdf_simplefont.cpp

diff --git a/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp b/core/fpdfapi/font/cpdf_simplefont.cpp
similarity index 98%
rename from core/fpdfapi/fpdf_font/cpdf_simplefont.cpp
rename to core/fpdfapi/font/cpdf_simplefont.cpp
index 3bb3730..b596cf0 100644
--- a/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp
+++ b/core/fpdfapi/font/cpdf_simplefont.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_simplefont.h"
+#include "core/fpdfapi/font/cpdf_simplefont.h"
 
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fxge/fx_freetype.h"

core/fpdfapi/font/cpdf_simplefont.h

diff --git a/core/fpdfapi/fpdf_font/cpdf_simplefont.h b/core/fpdfapi/font/cpdf_simplefont.h
similarity index 82%
rename from core/fpdfapi/fpdf_font/cpdf_simplefont.h
rename to core/fpdfapi/font/cpdf_simplefont.h
index f286c1a..592290b 100644
--- a/core/fpdfapi/fpdf_font/cpdf_simplefont.h
+++ b/core/fpdfapi/font/cpdf_simplefont.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_SIMPLEFONT_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_SIMPLEFONT_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_SIMPLEFONT_H_
+#define CORE_FPDFAPI_FONT_CPDF_SIMPLEFONT_H_
 
 #include <vector>
 
-#include "core/fpdfapi/fpdf_font/cpdf_font.h"
-#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
+#include "core/fpdfapi/font/cpdf_font.h"
+#include "core/fpdfapi/font/cpdf_fontencoding.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 
@@ -46,4 +46,4 @@
   bool m_bUseFontWidth;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_SIMPLEFONT_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_SIMPLEFONT_H_

core/fpdfapi/font/cpdf_truetypefont.cpp

diff --git a/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp b/core/fpdfapi/font/cpdf_truetypefont.cpp
similarity index 98%
rename from core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp
rename to core/fpdfapi/font/cpdf_truetypefont.cpp
index 08c3e11..f3b5f25 100644
--- a/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp
+++ b/core/fpdfapi/font/cpdf_truetypefont.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_truetypefont.h"
+#include "core/fpdfapi/font/cpdf_truetypefont.h"
 
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fxge/fx_font.h"
 

core/fpdfapi/font/cpdf_truetypefont.h

diff --git a/core/fpdfapi/fpdf_font/cpdf_truetypefont.h b/core/fpdfapi/font/cpdf_truetypefont.h
similarity index 75%
rename from core/fpdfapi/fpdf_font/cpdf_truetypefont.h
rename to core/fpdfapi/font/cpdf_truetypefont.h
index 8711b8f..6a5e0fc 100644
--- a/core/fpdfapi/fpdf_font/cpdf_truetypefont.h
+++ b/core/fpdfapi/font/cpdf_truetypefont.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_TRUETYPEFONT_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_TRUETYPEFONT_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_TRUETYPEFONT_H_
+#define CORE_FPDFAPI_FONT_CPDF_TRUETYPEFONT_H_
 
-#include "core/fpdfapi/fpdf_font/cpdf_simplefont.h"
+#include "core/fpdfapi/font/cpdf_simplefont.h"
 #include "core/fxcrt/fx_system.h"
 
 class CPDF_TrueTypeFont : public CPDF_SimpleFont {
@@ -27,4 +27,4 @@
   void LoadGlyphMap() override;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_TRUETYPEFONT_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_TRUETYPEFONT_H_

core/fpdfapi/font/cpdf_type1font.cpp

diff --git a/core/fpdfapi/fpdf_font/cpdf_type1font.cpp b/core/fpdfapi/font/cpdf_type1font.cpp
similarity index 99%
rename from core/fpdfapi/fpdf_font/cpdf_type1font.cpp
rename to core/fpdfapi/font/cpdf_type1font.cpp
index d80d59a..7848af5 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type1font.cpp
+++ b/core/fpdfapi/font/cpdf_type1font.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_type1font.h"
+#include "core/fpdfapi/font/cpdf_type1font.h"
 
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fxge/cfx_gemodule.h"
 #include "core/fxge/fx_freetype.h"

core/fpdfapi/font/cpdf_type1font.h

diff --git a/core/fpdfapi/fpdf_font/cpdf_type1font.h b/core/fpdfapi/font/cpdf_type1font.h
similarity index 78%
rename from core/fpdfapi/fpdf_font/cpdf_type1font.h
rename to core/fpdfapi/font/cpdf_type1font.h
index 3cc59aa..4dc5ea0 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type1font.h
+++ b/core/fpdfapi/font/cpdf_type1font.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE1FONT_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE1FONT_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_TYPE1FONT_H_
+#define CORE_FPDFAPI_FONT_CPDF_TYPE1FONT_H_
 
-#include "core/fpdfapi/fpdf_font/cpdf_simplefont.h"
+#include "core/fpdfapi/font/cpdf_simplefont.h"
 #include "core/fxcrt/fx_system.h"
 
 class CPDF_Type1Font : public CPDF_SimpleFont {
@@ -32,4 +32,4 @@
   int m_Base14Font;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE1FONT_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_TYPE1FONT_H_

core/fpdfapi/font/cpdf_type3char.cpp

diff --git a/core/fpdfapi/fpdf_font/cpdf_type3char.cpp b/core/fpdfapi/font/cpdf_type3char.cpp
similarity index 92%
rename from core/fpdfapi/fpdf_font/cpdf_type3char.cpp
rename to core/fpdfapi/font/cpdf_type3char.cpp
index a11f319..2114486d 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type3char.cpp
+++ b/core/fpdfapi/font/cpdf_type3char.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_type3char.h"
+#include "core/fpdfapi/font/cpdf_type3char.h"
 
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_page/cpdf_image.h"
@@ -15,8 +15,7 @@
 CPDF_Type3Char::CPDF_Type3Char(CPDF_Form* pForm)
     : m_pForm(pForm), m_bColored(FALSE) {}
 
-CPDF_Type3Char::~CPDF_Type3Char() {
-}
+CPDF_Type3Char::~CPDF_Type3Char() {}
 
 FX_BOOL CPDF_Type3Char::LoadBitmap(CPDF_RenderContext* pContext) {
   if (m_pBitmap || !m_pForm)

core/fpdfapi/font/cpdf_type3char.h

diff --git a/core/fpdfapi/fpdf_font/cpdf_type3char.h b/core/fpdfapi/font/cpdf_type3char.h
similarity index 83%
rename from core/fpdfapi/fpdf_font/cpdf_type3char.h
rename to core/fpdfapi/font/cpdf_type3char.h
index 3254906..ebb5ed4 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type3char.h
+++ b/core/fpdfapi/font/cpdf_type3char.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE3CHAR_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE3CHAR_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_TYPE3CHAR_H_
+#define CORE_FPDFAPI_FONT_CPDF_TYPE3CHAR_H_
 
 #include <memory>
 
@@ -32,4 +32,4 @@
   FX_RECT m_BBox;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE3CHAR_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_TYPE3CHAR_H_

core/fpdfapi/font/cpdf_type3font.cpp

diff --git a/core/fpdfapi/fpdf_font/cpdf_type3font.cpp b/core/fpdfapi/font/cpdf_type3font.cpp
similarity index 97%
rename from core/fpdfapi/fpdf_font/cpdf_type3font.cpp
rename to core/fpdfapi/font/cpdf_type3font.cpp
index e43ccda..ae301c2 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type3font.cpp
+++ b/core/fpdfapi/font/cpdf_type3font.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
+#include "core/fpdfapi/font/cpdf_type3font.h"
 
 #include <utility>
 
-#include "core/fpdfapi/fpdf_font/cpdf_type3char.h"
+#include "core/fpdfapi/font/cpdf_type3char.h"
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"

core/fpdfapi/font/cpdf_type3font.h

diff --git a/core/fpdfapi/fpdf_font/cpdf_type3font.h b/core/fpdfapi/font/cpdf_type3font.h
similarity index 87%
rename from core/fpdfapi/fpdf_font/cpdf_type3font.h
rename to core/fpdfapi/font/cpdf_type3font.h
index 0307829..0bae192 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type3font.h
+++ b/core/fpdfapi/font/cpdf_type3font.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE3FONT_H_
-#define CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE3FONT_H_
+#ifndef CORE_FPDFAPI_FONT_CPDF_TYPE3FONT_H_
+#define CORE_FPDFAPI_FONT_CPDF_TYPE3FONT_H_
 
 #include <map>
 #include <memory>
 
-#include "core/fpdfapi/fpdf_font/cpdf_simplefont.h"
+#include "core/fpdfapi/font/cpdf_simplefont.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
 
@@ -56,4 +56,4 @@
   int m_CharLoadingDepth;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE3FONT_H_
+#endif  // CORE_FPDFAPI_FONT_CPDF_TYPE3FONT_H_

core/fpdfapi/font/font_int.h

diff --git a/core/fpdfapi/fpdf_font/font_int.h b/core/fpdfapi/font/font_int.h
similarity index 96%
rename from core/fpdfapi/fpdf_font/font_int.h
rename to core/fpdfapi/font/font_int.h
index dce9e0c..10c2dca 100644
--- a/core/fpdfapi/fpdf_font/font_int.h
+++ b/core/fpdfapi/font/font_int.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_
-#define CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_
+#ifndef CORE_FPDFAPI_FONT_FONT_INT_H_
+#define CORE_FPDFAPI_FONT_FONT_INT_H_
 
 #include <map>
 #include <memory>
 
-#include "core/fpdfapi/fpdf_font/cpdf_cidfont.h"
+#include "core/fpdfapi/font/cpdf_cidfont.h"
 #include "core/fxcrt/fx_basic.h"
 
 class CPDF_CID2UnicodeMap;
@@ -201,4 +201,4 @@
   CFX_WideTextBuf m_MultiCharBuf;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_
+#endif  // CORE_FPDFAPI_FONT_FONT_INT_H_

core/fpdfapi/font/fpdf_font.cpp

diff --git a/core/fpdfapi/fpdf_font/fpdf_font.cpp b/core/fpdfapi/font/fpdf_font.cpp
similarity index 99%
rename from core/fpdfapi/fpdf_font/fpdf_font.cpp
rename to core/fpdfapi/font/fpdf_font.cpp
index 825cd61..4763fe5 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/fpdfapi/font/fpdf_font.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"

core/fpdfapi/font/fpdf_font_cid.cpp

diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/fpdfapi/font/fpdf_font_cid.cpp
similarity index 99%
rename from core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
rename to core/fpdfapi/font/fpdf_font_cid.cpp
index 9111712..1d8052b 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
+++ b/core/fpdfapi/font/fpdf_font_cid.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/ttgsubtable.h"
+#include "core/fpdfapi/font/ttgsubtable.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
@@ -21,7 +21,6 @@
 const FX_CHAR* const g_CharsetNames[CIDSET_NUM_SETS] = {
     nullptr, "GB1", "CNS1", "Japan1", "Korea1", "UCS"};
 
-
 class CPDF_PredefinedCMap {
  public:
   const FX_CHAR* m_pName;

core/fpdfapi/font/fpdf_font_cid_unittest.cpp

diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp b/core/fpdfapi/font/fpdf_font_cid_unittest.cpp
similarity index 97%
rename from core/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp
rename to core/fpdfapi/font/fpdf_font_cid_unittest.cpp
index ec05df5..53f5e47 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp
+++ b/core/fpdfapi/font/fpdf_font_cid_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

core/fpdfapi/font/fpdf_font_unittest.cpp

diff --git a/core/fpdfapi/fpdf_font/fpdf_font_unittest.cpp b/core/fpdfapi/font/fpdf_font_unittest.cpp
similarity index 95%
rename from core/fpdfapi/fpdf_font/fpdf_font_unittest.cpp
rename to core/fpdfapi/font/fpdf_font_unittest.cpp
index 0c5ad8a..977ae8a 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font_unittest.cpp
+++ b/core/fpdfapi/font/fpdf_font_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(fpdf_font, StringToCode) {

core/fpdfapi/font/ttgsubtable.cpp

diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/fpdfapi/font/ttgsubtable.cpp
similarity index 99%
rename from core/fpdfapi/fpdf_font/ttgsubtable.cpp
rename to core/fpdfapi/font/ttgsubtable.cpp
index dde7793..51f533d 100644
--- a/core/fpdfapi/fpdf_font/ttgsubtable.cpp
+++ b/core/fpdfapi/font/ttgsubtable.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_font/ttgsubtable.h"
+#include "core/fpdfapi/font/ttgsubtable.h"
 
 #include "core/fxge/fx_freetype.h"
 #include "third_party/base/stl_util.h"

core/fpdfapi/font/ttgsubtable.h

diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.h b/core/fpdfapi/font/ttgsubtable.h
similarity index 97%
rename from core/fpdfapi/fpdf_font/ttgsubtable.h
rename to core/fpdfapi/font/ttgsubtable.h
index 492a6a2..b385391 100644
--- a/core/fpdfapi/fpdf_font/ttgsubtable.h
+++ b/core/fpdfapi/font/ttgsubtable.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
-#define CORE_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
+#ifndef CORE_FPDFAPI_FONT_TTGSUBTABLE_H_
+#define CORE_FPDFAPI_FONT_TTGSUBTABLE_H_
 
 #include <stdint.h>
 
@@ -298,4 +298,4 @@
   TLookupList LookupList;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
+#endif  // CORE_FPDFAPI_FONT_TTGSUBTABLE_H_

core/fpdfapi/fpdf_page/cpdf_pagemodule.h

diff --git a/core/fpdfapi/fpdf_page/cpdf_pagemodule.h b/core/fpdfapi/fpdf_page/cpdf_pagemodule.h
index c1f0ede..35316cd 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pagemodule.h
+++ b/core/fpdfapi/fpdf_page/cpdf_pagemodule.h
@@ -7,7 +7,7 @@
 #ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEMODULE_H_
 #define CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEMODULE_H_
 
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_colorspace.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
 

core/fpdfapi/fpdf_page/cpdf_textobject.cpp

diff --git a/core/fpdfapi/fpdf_page/cpdf_textobject.cpp b/core/fpdfapi/fpdf_page/cpdf_textobject.cpp
index 1119d29..97f6ad2 100644
--- a/core/fpdfapi/fpdf_page/cpdf_textobject.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_textobject.cpp
@@ -6,8 +6,8 @@
 
 #include "core/fpdfapi/fpdf_page/cpdf_textobject.h"
 
-#include "core/fpdfapi/fpdf_font/cpdf_cidfont.h"
-#include "core/fpdfapi/fpdf_font/cpdf_font.h"
+#include "core/fpdfapi/font/cpdf_cidfont.h"
+#include "core/fpdfapi/font/cpdf_font.h"
 
 CPDF_TextObject::CPDF_TextObject()
     : m_PosX(0),

core/fpdfapi/fpdf_page/cpdf_textstate.cpp

diff --git a/core/fpdfapi/fpdf_page/cpdf_textstate.cpp b/core/fpdfapi/fpdf_page/cpdf_textstate.cpp
index 578624d..800af23 100644
--- a/core/fpdfapi/fpdf_page/cpdf_textstate.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_textstate.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_page/cpdf_textstate.h"
 
-#include "core/fpdfapi/fpdf_font/cpdf_font.h"
+#include "core/fpdfapi/font/cpdf_font.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 

core/fpdfapi/fpdf_page/fpdf_page_doc.cpp

diff --git a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
index 82cb405..4b1eaa3 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
@@ -11,8 +11,8 @@
 
 #include "core/fdrm/crypto/fx_crypt.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type1font.h"
-#include "core/fpdfapi/fpdf_font/font_int.h"
+#include "core/fpdfapi/font/cpdf_type1font.h"
+#include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/fpdf_page/cpdf_image.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pattern.h"

core/fpdfapi/fpdf_page/fpdf_page_parser.cpp

diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
index ccdc897..c0059b8 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include "core/fpdfapi/edit/cpdf_creator.h"
-#include "core/fpdfapi/fpdf_font/cpdf_font.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
+#include "core/fpdfapi/font/cpdf_font.h"
+#include "core/fpdfapi/font/cpdf_type3font.h"
 #include "core/fpdfapi/fpdf_page/cpdf_allstates.h"
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_page/cpdf_formobject.h"

core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp

diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
index 3c7a301..3c3104b 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
@@ -9,7 +9,7 @@
 #include <limits.h>
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3char.h"
+#include "core/fpdfapi/font/cpdf_type3char.h"
 #include "core/fpdfapi/fpdf_page/cpdf_allstates.h"
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_page/cpdf_page.h"

core/fpdfapi/fpdf_parser/cpdf_document.cpp

diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.cpp b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
index 75e6a84..811f3a9 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_document.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
+#include "core/fpdfapi/font/cpdf_fontencoding.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"

core/fpdfapi/fpdf_render/cpdf_type3cache.cpp

diff --git a/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp b/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp
index 6de46a6..1891a8d 100644
--- a/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp
+++ b/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp
@@ -9,8 +9,8 @@
 #include <map>
 #include <memory>
 
-#include "core/fpdfapi/fpdf_font/cpdf_type3char.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
+#include "core/fpdfapi/font/cpdf_type3char.h"
+#include "core/fpdfapi/font/cpdf_type3font.h"
 #include "core/fpdfapi/fpdf_render/cpdf_type3glyphs.h"
 #include "core/fxge/fx_dib.h"
 #include "core/fxge/fx_font.h"

core/fpdfapi/fpdf_render/cpdf_type3cache.h

diff --git a/core/fpdfapi/fpdf_render/cpdf_type3cache.h b/core/fpdfapi/fpdf_render/cpdf_type3cache.h
index 199bc28..ea4b5a1 100644
--- a/core/fpdfapi/fpdf_render/cpdf_type3cache.h
+++ b/core/fpdfapi/fpdf_render/cpdf_type3cache.h
@@ -9,7 +9,7 @@
 
 #include <map>
 
-#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
+#include "core/fpdfapi/font/cpdf_type3font.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"

core/fpdfapi/fpdf_render/fpdf_render.cpp

diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp
index a87a40a..cb1b204 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -9,8 +9,8 @@
 #include <memory>
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3char.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
+#include "core/fpdfapi/font/cpdf_type3char.h"
+#include "core/fpdfapi/font/cpdf_type3font.h"
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_page/cpdf_formobject.h"
 #include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"

core/fpdfapi/fpdf_render/fpdf_render_text.cpp

diff --git a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
index 1ddf954..2554f64 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
@@ -8,10 +8,10 @@
 
 #include <vector>
 
-#include "core/fpdfapi/fpdf_font/cpdf_cidfont.h"
-#include "core/fpdfapi/fpdf_font/cpdf_font.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3char.h"
-#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
+#include "core/fpdfapi/font/cpdf_cidfont.h"
+#include "core/fpdfapi/font/cpdf_font.h"
+#include "core/fpdfapi/font/cpdf_type3char.h"
+#include "core/fpdfapi/font/cpdf_type3font.h"
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
 #include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"