From 2e95951e06bd4d11459fb257c7c2b8fc881854e8 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Wed, 9 Mar 2016 15:33:14 -0500
Subject: 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 .
---
 xfa/src/fxfa/app/xfa_ffpageview.cpp  | 2 +-
 xfa/src/fxfa/app/xfa_ffwidgetacc.cpp | 2 +-
 xfa/src/fxfa/app/xfa_fwltheme.cpp    | 2 +-
 xfa/src/fxfa/app/xfa_textlayout.cpp  | 2 +-
 xfa/src/fxfa/app/xfa_textlayout.h    | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'xfa/src/fxfa/app')

diff --git a/xfa/src/fxfa/app/xfa_ffpageview.cpp b/xfa/src/fxfa/app/xfa_ffpageview.cpp
index 3b0f63f4d9..ba4c9709eb 100644
--- a/xfa/src/fxfa/app/xfa_ffpageview.cpp
+++ b/xfa/src/fxfa/app/xfa_ffpageview.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/src/fxfa/app/xfa_ffpageview.h"
 
-#include "xfa/src/fdp/include/fde_rdr.h"
+#include "xfa/src/fde/fde_render.h"
 #include "xfa/src/fxfa/app/xfa_ffcheckbutton.h"
 #include "xfa/src/fxfa/app/xfa_ffchoicelist.h"
 #include "xfa/src/fxfa/app/xfa_ffdoc.h"
diff --git a/xfa/src/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/app/xfa_ffwidgetacc.cpp
index 313f946a0f..10aaad0dc5 100644
--- a/xfa/src/fxfa/app/xfa_ffwidgetacc.cpp
+++ b/xfa/src/fxfa/app/xfa_ffwidgetacc.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fxfa/app/xfa_ffapp.h"
 #include "xfa/src/fxfa/app/xfa_ffcheckbutton.h"
 #include "xfa/src/fxfa/app/xfa_ffchoicelist.h"
diff --git a/xfa/src/fxfa/app/xfa_fwltheme.cpp b/xfa/src/fxfa/app/xfa_fwltheme.cpp
index a56aa60628..e13917bf7b 100644
--- a/xfa/src/fxfa/app/xfa_fwltheme.cpp
+++ b/xfa/src/fxfa/app/xfa_fwltheme.cpp
@@ -17,7 +17,7 @@
 #include "xfa/include/fwl/basewidget/fwl_picturebox.h"
 #include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
 #include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
-#include "xfa/src/fdp/include/fde_tto.h"
+#include "xfa/src/fde/tto/fde_textout.h"
 #include "xfa/src/fgas/crt/fgas_codepage.h"
 #include "xfa/src/fxfa/app/xfa_ffapp.h"
 #include "xfa/src/fxfa/app/xfa_ffwidget.h"
diff --git a/xfa/src/fxfa/app/xfa_textlayout.cpp b/xfa/src/fxfa/app/xfa_textlayout.cpp
index b59e8aac82..e8a23b1523 100644
--- a/xfa/src/fxfa/app/xfa_textlayout.cpp
+++ b/xfa/src/fxfa/app/xfa_textlayout.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 
 #include "core/include/fxcrt/fx_ext.h"
-#include "xfa/src/fdp/include/fde_pen.h"
+#include "xfa/src/fde/fde_pen.h"
 #include "xfa/src/fgas/crt/fgas_algorithm.h"
 #include "xfa/src/fgas/crt/fgas_codepage.h"
 #include "xfa/src/fxfa/app/xfa_ffapp.h"
diff --git a/xfa/src/fxfa/app/xfa_textlayout.h b/xfa/src/fxfa/app/xfa_textlayout.h
index 90d33737eb..bcace9d9d6 100644
--- a/xfa/src/fxfa/app/xfa_textlayout.h
+++ b/xfa/src/fxfa/app/xfa_textlayout.h
@@ -7,9 +7,9 @@
 #ifndef XFA_SRC_FXFA_APP_XFA_TEXTLAYOUT_H_
 #define XFA_SRC_FXFA_APP_XFA_TEXTLAYOUT_H_
 
-#include "xfa/src/fdp/include/fde_brs.h"
-#include "xfa/src/fdp/include/fde_css.h"
-#include "xfa/src/fdp/include/fde_rdv.h"
+#include "xfa/src/fde/css/fde_css.h"
+#include "xfa/src/fde/fde_brush.h"
+#include "xfa/src/fde/fde_renderdevice.h"
 #include "xfa/src/fgas/layout/fgas_rtfbreak.h"
 #include "xfa/src/fxfa/app/xfa_ffdoc.h"
 #include "xfa/src/fxfa/parser/xfa_object.h"
-- 
cgit v1.2.3