Cleanup the xfa/src/fdp directory.

This CL renames xfa/src/fdp to xfa/src/fde to better match all of the content
(nothing mentions fdp other then the directory name). The inner src/ and
include/ folders are collapsed up a level and xfa/src/fdp/src/fde is moved
up to xfa/src/fde.

Some of the header moves conflicted with existing headers. In that case, the
existing header had the content moved into the .cpp file and we replaced the
existing header with the one from include/.

R=tsepez@chromium.org

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

14 files changed, 15 insertions, 15 deletions

diff --git a/xfa/src/fwl/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/basewidget/fwl_checkboximp.cpp
index ba9f0fedc3..16cc8f7080 100644
--- a/xfa/src/fwl/basewidget/fwl_checkboximp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_checkboximp.cpp
@@ -10,7 +10,7 @@
 
 #include "xfa/include/fwl/basewidget/fwl_checkbox.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
 #include "xfa/src/fwl/core/fwl_targetimp.h"
 #include "xfa/src/fwl/core/fwl_widgetimp.h"
diff --git a/xfa/src/fwl/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/basewidget/fwl_comboboximp.cpp
index 842ab8aaa9..5eef96eebf 100644
--- a/xfa/src/fwl/basewidget/fwl_comboboximp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_comboboximp.cpp
@@ -7,7 +7,7 @@
 #include "xfa/src/fwl/basewidget/fwl_comboboximp.h"
 
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/basewidget/fwl_editimp.h"
 #include "xfa/src/fwl/basewidget/fwl_formproxyimp.h"
 #include "xfa/src/fwl/basewidget/fwl_listboximp.h"
diff --git a/xfa/src/fwl/basewidget/fwl_editimp.cpp b/xfa/src/fwl/basewidget/fwl_editimp.cpp
index 6c802ff24f..662fa91ec1 100644
--- a/xfa/src/fwl/basewidget/fwl_editimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_editimp.cpp
@@ -12,8 +12,8 @@
 #include "xfa/include/fwl/basewidget/fwl_caret.h"
 #include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_rdr.h"
-#include "xfa/src/fdp/include/fde_rdv.h"
+#include "xfa/src/fde/fde_render.h"
+#include "xfa/src/fde/fde_renderdevice.h"
 #include "xfa/src/fee/ifde_txtedtpage.h"
 #include "xfa/src/fwl/basewidget/fwl_caretimp.h"
 #include "xfa/src/fwl/basewidget/fwl_comboboximp.h"
diff --git a/xfa/src/fwl/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/basewidget/fwl_listboximp.cpp
index 26b27e8637..aac2d27bdf 100644
--- a/xfa/src/fwl/basewidget/fwl_listboximp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_listboximp.cpp
@@ -7,7 +7,7 @@
 #include "xfa/src/fwl/basewidget/fwl_listboximp.h"
 
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/basewidget/fwl_comboboximp.h"
 #include "xfa/src/fwl/basewidget/fwl_scrollbarimp.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
diff --git a/xfa/src/fwl/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/basewidget/fwl_monthcalendarimp.cpp
index 102f225a1d..8bea9f1a11 100644
--- a/xfa/src/fwl/basewidget/fwl_monthcalendarimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_monthcalendarimp.cpp
@@ -10,7 +10,7 @@
 
 #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
 #include "xfa/src/fwl/core/fwl_targetimp.h"
 #include "xfa/src/fwl/core/fwl_widgetimp.h"
diff --git a/xfa/src/fwl/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/basewidget/fwl_pushbuttonimp.cpp
index 2325217dc2..4ed0e3bfec 100644
--- a/xfa/src/fwl/basewidget/fwl_pushbuttonimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_pushbuttonimp.cpp
@@ -7,7 +7,7 @@
 #include "xfa/src/fwl/basewidget/fwl_pushbuttonimp.h"
 
 #include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
 #include "xfa/src/fwl/core/fwl_targetimp.h"
 #include "xfa/src/fwl/core/fwl_widgetimp.h"
diff --git a/xfa/src/fwl/basewidget/fwl_tooltipctrlimp.cpp b/xfa/src/fwl/basewidget/fwl_tooltipctrlimp.cpp
index 63966ba4c8..696a2e2b39 100644
--- a/xfa/src/fwl/basewidget/fwl_tooltipctrlimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_tooltipctrlimp.cpp
@@ -8,7 +8,7 @@
 
 #include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/core/fwl_formimp.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
 #include "xfa/src/fwl/core/fwl_panelimp.h"
diff --git a/xfa/src/fwl/core/fwl_formimp.cpp b/xfa/src/fwl/core/fwl_formimp.cpp
index 426c1faa63..558ee00f9c 100644
--- a/xfa/src/fwl/core/fwl_formimp.cpp
+++ b/xfa/src/fwl/core/fwl_formimp.cpp
@@ -10,7 +10,7 @@
 #include "xfa/include/fwl/core/fwl_app.h"
 #include "xfa/include/fwl/core/fwl_content.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/basewidget/fwl_formproxyimp.h"
 #include "xfa/src/fwl/core/fwl_appimp.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
diff --git a/xfa/src/fwl/core/fwl_widgetimp.cpp b/xfa/src/fwl/core/fwl_widgetimp.cpp
index 1e788260c2..32d80d1fb3 100644
--- a/xfa/src/fwl/core/fwl_widgetimp.cpp
+++ b/xfa/src/fwl/core/fwl_widgetimp.cpp
@@ -18,7 +18,7 @@
 #include "xfa/include/fwl/core/fwl_content.h"
 #include "xfa/include/fwl/core/fwl_form.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/core/fwl_appimp.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
 #include "xfa/src/fwl/core/fwl_targetimp.h"
diff --git a/xfa/src/fwl/lightwidget/widget.cpp b/xfa/src/fwl/lightwidget/widget.cpp
index dc7de101bd..58fb2a71d1 100644
--- a/xfa/src/fwl/lightwidget/widget.cpp
+++ b/xfa/src/fwl/lightwidget/widget.cpp
@@ -8,7 +8,7 @@
 
 #include "xfa/include/fwl/core/fwl_theme.h"
 #include "xfa/include/fwl/core/fwl_thread.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
 #include "xfa/src/fwl/core/fwl_noteimp.h"
 #include "xfa/src/fwl/core/fwl_targetimp.h"
diff --git a/xfa/src/fwl/theme/checkboxtp.cpp b/xfa/src/fwl/theme/checkboxtp.cpp
index a33291472a..ccad2bc733 100644
--- a/xfa/src/fwl/theme/checkboxtp.cpp
+++ b/xfa/src/fwl/theme/checkboxtp.cpp
@@ -8,7 +8,7 @@
 
 #include "xfa/include/fwl/basewidget/fwl_checkbox.h"
 #include "xfa/include/fwl/core/fwl_widget.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 
 #define CHECKBOX_SIZE_SIGNMARGIN 3
 #define CHECKBOX_SIZE_SIGNBORDER 2
diff --git a/xfa/src/fwl/theme/formtp.cpp b/xfa/src/fwl/theme/formtp.cpp
index 1d6dcd1c17..e8f3b6addc 100644
--- a/xfa/src/fwl/theme/formtp.cpp
+++ b/xfa/src/fwl/theme/formtp.cpp
@@ -8,7 +8,7 @@
 
 #include "xfa/include/fwl/core/fwl_form.h"
 #include "xfa/include/fwl/core/fwl_widget.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 
 #define FWLTHEME_CAPACITY_CXFormBorder 3
 #define FWLTHEME_CAPACITY_CYFormBorder 3
diff --git a/xfa/src/fwl/theme/monthcalendartp.cpp b/xfa/src/fwl/theme/monthcalendartp.cpp
index 47384b979f..0dea73f675 100644
--- a/xfa/src/fwl/theme/monthcalendartp.cpp
+++ b/xfa/src/fwl/theme/monthcalendartp.cpp
@@ -8,7 +8,7 @@
 
 #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h"
 #include "xfa/include/fwl/core/fwl_widget.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 
 #define FWL_THEMECAPACITY_MC_HEADER_WIDTH 200
 #define FWL_THEMECAPACITY_MC_HEADER_HEIGHT 30
diff --git a/xfa/src/fwl/theme/widgettp.cpp b/xfa/src/fwl/theme/widgettp.cpp
index 7fa7812092..c26a62c561 100644
--- a/xfa/src/fwl/theme/widgettp.cpp
+++ b/xfa/src/fwl/theme/widgettp.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 
 #include "xfa/include/fwl/core/fwl_widgetmgr.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 
 static void FWL_SetChildThemeID(IFWL_Widget* pParent, FX_DWORD dwThemeID) {
   IFWL_WidgetMgr* pWidgetMgr = FWL_GetWidgetMgr();