Move core/fxge/include to core/fxge

BUILD.gn

Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 0c3bd09f42029c4a60ce855ead02d18908caf5e5..315eaa207e2a8e4b40c2a40334d0b7ab40d49147 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -758,6 +758,19 @@ static_library("fxge") {
     "core/fxge/apple/cfx_quartzdevice.h",
     "core/fxge/apple/fx_mac_imp.cpp",
     "core/fxge/apple/fx_quartz_device.cpp",
+    "core/fxge/cfx_facecache.h",
+    "core/fxge/cfx_fontcache.h",
+    "core/fxge/cfx_fontmapper.h",
+    "core/fxge/cfx_fontmgr.h",
+    "core/fxge/cfx_fxgedevice.h",
+    "core/fxge/cfx_gemodule.h",
+    "core/fxge/cfx_graphstate.h",
+    "core/fxge/cfx_graphstatedata.h",
+    "core/fxge/cfx_pathdata.h",
+    "core/fxge/cfx_renderdevice.h",
+    "core/fxge/cfx_substfont.h",
+    "core/fxge/cfx_unicodeencoding.h",
+    "core/fxge/cfx_windowsdevice.h",
     "core/fxge/dib/dib_int.h",
     "core/fxge/dib/fx_dib_composite.cpp",
     "core/fxge/dib/fx_dib_convert.cpp",
@@ -782,6 +795,9 @@ static_library("fxge") {
     "core/fxge/fontdata/chromefontdata/FoxitSymbol.cpp",
     "core/fxge/fontdata/chromefontdata/chromefontdata.h",
     "core/fxge/freetype/fx_freetype.cpp",
+    "core/fxge/fx_dib.h",
+    "core/fxge/fx_font.h",
+    "core/fxge/fx_freetype.h",
     "core/fxge/ge/cfx_cliprgn.cpp",
     "core/fxge/ge/cfx_cliprgn.h",
     "core/fxge/ge/cfx_facecache.cpp",
@@ -805,24 +821,8 @@ static_library("fxge") {
     "core/fxge/ge/fx_ge_text.cpp",
     "core/fxge/ge/fx_text_int.h",
     "core/fxge/ifx_renderdevicedriver.cpp",
-    "core/fxge/include/cfx_facecache.h",
-    "core/fxge/include/cfx_fontcache.h",
-    "core/fxge/include/cfx_fontmapper.h",
-    "core/fxge/include/cfx_fontmgr.h",
-    "core/fxge/include/cfx_fxgedevice.h",
-    "core/fxge/include/cfx_gemodule.h",
-    "core/fxge/include/cfx_graphstate.h",
-    "core/fxge/include/cfx_graphstatedata.h",
-    "core/fxge/include/cfx_pathdata.h",
-    "core/fxge/include/cfx_renderdevice.h",
-    "core/fxge/include/cfx_substfont.h",
-    "core/fxge/include/cfx_unicodeencoding.h",
-    "core/fxge/include/cfx_windowsdevice.h",
-    "core/fxge/include/fx_dib.h",
-    "core/fxge/include/fx_font.h",
-    "core/fxge/include/fx_freetype.h",
-    "core/fxge/include/ifx_renderdevicedriver.h",
-    "core/fxge/include/ifx_systemfontinfo.h",
+    "core/fxge/ifx_renderdevicedriver.h",
+    "core/fxge/ifx_systemfontinfo.h",
     "core/fxge/win32/cfx_windowsdib.h",
   ]
 
@@ -837,8 +837,8 @@ static_library("fxge") {
 
   if (pdf_enable_xfa) {
     sources += [
+      "core/fxge/cfx_unicodeencodingex.h",
       "core/fxge/ge/cfx_unicodeencodingex.cpp",
-      "core/fxge/include/cfx_unicodeencodingex.h",
     ]
   }