Collapse xfa/src/fee directorieschromium/2674chromium/2673

This CL moves xfa/src/fee/src/fee up to xfa/src/fee and moves the
xfa/src/fee/include files up to xfa/src/fee.

R=tsepez@chromium.org

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

15 files changed, 62 insertions, 64 deletions

diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp b/xfa/src/fee/fde_txtedtbuf.cpp
index c57fff38c4..93a12dd282 100644
--- a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp
+++ b/xfa/src/fee/fde_txtedtbuf.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fee/src/fee/fde_txtedtbuf.h"
+#include "xfa/src/fee/fde_txtedtbuf.h"
 
 #include <algorithm>
 
-#include "xfa/src/fee/include/ifde_txtedtbuf.h"
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
+#include "xfa/src/fee/ifde_txtedtbuf.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
 
 #define FDE_DEFCHUNKCOUNT 2
 #define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9
diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.h b/xfa/src/fee/fde_txtedtbuf.h
index 1be60f8d15..1b2d19f7e8 100644
--- a/xfa/src/fee/src/fee/fde_txtedtbuf.h
+++ b/xfa/src/fee/fde_txtedtbuf.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_
-#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_
+#ifndef XFA_SRC_FEE_FDE_TXTEDTBUF_H_
+#define XFA_SRC_FEE_FDE_TXTEDTBUF_H_
 
-#include "xfa/src/fee/include/ifde_txtedtbuf.h"
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
+#include "xfa/src/fee/ifde_txtedtbuf.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
 #include "xfa/src/fgas/include/fx_mem.h"
 
 class IFX_CharIter;
@@ -89,4 +89,4 @@ class CFDE_TxtEdtBuf : public IFDE_TxtEdtBuf {
   IFX_MEMAllocator* m_pAllocator;
 };
 
-#endif  // XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_
+#endif  // XFA_SRC_FEE_FDE_TXTEDTBUF_H_
diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/fde_txtedtengine.cpp
index cc5548900a..2430bc0256 100644
--- a/xfa/src/fee/src/fee/fde_txtedtengine.cpp
+++ b/xfa/src/fee/fde_txtedtengine.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fee/src/fee/fde_txtedtengine.h"
+#include "xfa/src/fee/fde_txtedtengine.h"
 
 #include <algorithm>
 
-#include "xfa/src/fee/include/ifde_txtedtbuf.h"
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
-#include "xfa/src/fee/include/ifde_txtedtpage.h"
-#include "xfa/src/fee/src/fee/fde_txtedtbuf.h"
-#include "xfa/src/fee/src/fee/fde_txtedtparag.h"
+#include "xfa/src/fee/fde_txtedtbuf.h"
+#include "xfa/src/fee/fde_txtedtparag.h"
+#include "xfa/src/fee/ifde_txtedtbuf.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
+#include "xfa/src/fee/ifde_txtedtpage.h"
 #include "xfa/src/fdp/include/fde_tto.h"
 
 #define FDE_PAGEWIDTH_MAX 0xFFFF
diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.h b/xfa/src/fee/fde_txtedtengine.h
index 6c80903cf8..ef1270f3d5 100644
--- a/xfa/src/fee/src/fee/fde_txtedtengine.h
+++ b/xfa/src/fee/fde_txtedtengine.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_
-#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_
+#ifndef XFA_SRC_FEE_FDE_TXTEDTENGINE_H_
+#define XFA_SRC_FEE_FDE_TXTEDTENGINE_H_
 
 #include "core/include/fxcrt/fx_string.h"
-#include "xfa/src/fee/include/ifde_txtedtbuf.h"
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
+#include "xfa/src/fee/ifde_txtedtbuf.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
 
 class IFX_TxtBreak;
 class IFX_CharIter;
@@ -244,4 +244,4 @@ class CFDE_TxtEdtDoRecord_DeleteRange : public IFDE_TxtEdtDoRecord {
   CFX_WideString m_wsRange;
 };
 
-#endif  // XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_
+#endif  // XFA_SRC_FEE_FDE_TXTEDTENGINE_H_
diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.cpp b/xfa/src/fee/fde_txtedtpage.cpp
index 14e7a94a8b..932832fd6f 100644
--- a/xfa/src/fee/src/fee/fde_txtedtpage.cpp
+++ b/xfa/src/fee/fde_txtedtpage.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fee/src/fee/fde_txtedtpage.h"
+#include "xfa/src/fee/fde_txtedtpage.h"
 
 #include <algorithm>
 
-#include "xfa/src/fee/include/fx_wordbreak.h"
-#include "xfa/src/fee/include/ifde_txtedtbuf.h"
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
-#include "xfa/src/fee/include/ifde_txtedtpage.h"
-#include "xfa/src/fee/src/fee/fde_txtedtbuf.h"
-#include "xfa/src/fee/src/fee/fde_txtedtengine.h"
-#include "xfa/src/fee/src/fee/fde_txtedtparag.h"
+#include "xfa/src/fee/fx_wordbreak/fx_wordbreak.h"
+#include "xfa/src/fee/fde_txtedtbuf.h"
+#include "xfa/src/fee/fde_txtedtengine.h"
+#include "xfa/src/fee/fde_txtedtparag.h"
+#include "xfa/src/fee/ifde_txtedtbuf.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
+#include "xfa/src/fee/ifde_txtedtpage.h"
 
 #define FDE_TXTEDT_TOLERANCE 0.1f
 
diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.h b/xfa/src/fee/fde_txtedtpage.h
index 9b67b6f486..e51f80ef8a 100644
--- a/xfa/src/fee/src/fee/fde_txtedtpage.h
+++ b/xfa/src/fee/fde_txtedtpage.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPAGE_H_
-#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPAGE_H_
+#ifndef XFA_SRC_FEE_FDE_TXTEDTPAGE_H_
+#define XFA_SRC_FEE_FDE_TXTEDTPAGE_H_
 
 #include "core/include/fxcrt/fx_coordinates.h"
 #include "core/include/fxcrt/fx_string.h"
 #include "xfa/src/fdp/include/fde_psr.h"
-#include "xfa/src/fee/include/ifde_txtedtpage.h"
+#include "xfa/src/fee/ifde_txtedtpage.h"
 #include "xfa/src/fgas/include/fx_utl.h"
 
 class IFX_CharIter;
@@ -165,4 +165,4 @@ class CFDE_TxtEdtPage : public IFDE_TxtEdtPage {
   int32_t* m_pCharWidth;
 };
 
-#endif  // XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPAGE_H_
+#endif  // XFA_SRC_FEE_FDE_TXTEDTPAGE_H_
diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.cpp b/xfa/src/fee/fde_txtedtparag.cpp
index 83b2fdd270..e5d1d9d3f1 100644
--- a/xfa/src/fee/src/fee/fde_txtedtparag.cpp
+++ b/xfa/src/fee/fde_txtedtparag.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fee/src/fee/fde_txtedtparag.h"
+#include "xfa/src/fee/fde_txtedtparag.h"
 
-#include "xfa/src/fee/include/fx_wordbreak.h"
-#include "xfa/src/fee/include/ifde_txtedtbuf.h"
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
-#include "xfa/src/fee/src/fee/fde_txtedtbuf.h"
-#include "xfa/src/fee/src/fee/fde_txtedtengine.h"
+#include "xfa/src/fee/fde_txtedtbuf.h"
+#include "xfa/src/fee/fde_txtedtengine.h"
+#include "xfa/src/fee/fx_wordbreak/fx_wordbreak.h"
+#include "xfa/src/fee/ifde_txtedtbuf.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
 #include "xfa/src/fgas/include/fx_tbk.h"
 
 CFDE_TxtEdtParag::CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine)
diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.h b/xfa/src/fee/fde_txtedtparag.h
index d850f6fe93..5af04970a1 100644
--- a/xfa/src/fee/src/fee/fde_txtedtparag.h
+++ b/xfa/src/fee/fde_txtedtparag.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPARAG_H_
-#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPARAG_H_
+#ifndef XFA_SRC_FEE_FDE_TXTEDTPARAG_H_
+#define XFA_SRC_FEE_FDE_TXTEDTPARAG_H_
 
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
 
 class CFDE_TxtEdtEngine;
 
@@ -34,4 +34,4 @@ class CFDE_TxtEdtParag : public IFDE_TxtEdtParag {
   CFDE_TxtEdtEngine* m_pEngine;
 };
 
-#endif  // XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPARAG_H_
+#endif  // XFA_SRC_FEE_FDE_TXTEDTPARAG_H_
diff --git a/xfa/src/fee/include/fx_wordbreak.h b/xfa/src/fee/fx_wordbreak/fx_wordbreak.h
index f545f487cd..f67afb6305 100644
--- a/xfa/src/fee/include/fx_wordbreak.h
+++ b/xfa/src/fee/fx_wordbreak/fx_wordbreak.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_INCLUDE_FX_WORDBREAK_H_
-#define XFA_SRC_FEE_INCLUDE_FX_WORDBREAK_H_
+#ifndef XFA_SRC_FEE_FX_WORDBREAK_FX_WORDBREAK_H_
+#define XFA_SRC_FEE_FX_WORDBREAK_FX_WORDBREAK_H_
 
 #include "core/include/fxcrt/fx_string.h"
 #include "core/include/fxcrt/fx_system.h"
@@ -27,4 +27,4 @@ class IFX_WordBreak {
 };
 IFX_WordBreak* FX_WordBreak_Create();
 
-#endif  // XFA_SRC_FEE_INCLUDE_FX_WORDBREAK_H_
+#endif  // XFA_SRC_FEE_FX_WORDBREAK_FX_WORDBREAK_H_
diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp b/xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.cpp
index 155d1658c6..036b4f80fa 100644
--- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp
+++ b/xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.cpp
@@ -4,14 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h"
-
-#define FX_IsOdd(a) ((a)&1)
+#include "xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.h"
 
 FX_WordBreakProp FX_GetWordBreakProperty(FX_WCHAR wcCodePoint) {
   FX_DWORD dwProperty =
       (FX_DWORD)gs_FX_WordBreak_CodePointProperties[wcCodePoint >> 1];
-  return (FX_WordBreakProp)(FX_IsOdd(wcCodePoint) ? (dwProperty & 0x0F)
+  return (FX_WordBreakProp)(((wcCodePoint) & 1) ? (dwProperty & 0x0F)
                                                   : (dwProperty >> 4));
 }
 CFX_CharIter::CFX_CharIter(const CFX_WideString& wsText)
diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h b/xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.h
index 616690bcea..253d83b9dc 100644
--- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
+++ b/xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.h
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_SRC_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_
-#define XFA_SRC_FEE_SRC_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_
+#ifndef XFA_SRC_FEE_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_
+#define XFA_SRC_FEE_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_
 
 #include <cstdint>
 
 #include "core/include/fxcrt/fx_string.h"
 #include "core/include/fxcrt/fx_system.h"
-#include "xfa/src/fee/include/fx_wordbreak.h"
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
-#include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h"
+#include "xfa/src/fee/fx_wordbreak/fx_wordbreak.h"
+#include "xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
 
 extern const FX_WORD gs_FX_WordBreak_Table[16];
 extern const uint8_t gs_FX_WordBreak_CodePointProperties[(0xFFFF - 1) / 2 + 1];
@@ -75,4 +75,4 @@ class CFX_WordBreak : public IFX_WordBreak {
   IFX_CharIter* m_pCurIter;
 };
 
-#endif  // XFA_SRC_FEE_SRC_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_
+#endif  // XFA_SRC_FEE_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_
diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp b/xfa/src/fee/fx_wordbreak/fx_wordbreakdata.cpp
index 9d4cc5cf94..ea1a31fb3c 100644
--- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp
+++ b/xfa/src/fee/fx_wordbreak/fx_wordbreakdata.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h"
+#include "xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.h"
 
 const FX_WORD gs_FX_WordBreak_Table[16] = {
     0xFFFF, 0xFFF9, 0xFFFB, 0xFFFB, 0xFFFB, 0xFFFB, 0xEFBB, 0xE77B,
diff --git a/xfa/src/fee/include/ifde_txtedtbuf.h b/xfa/src/fee/ifde_txtedtbuf.h
index f7c9550fe8..8cc7dfeab5 100644
--- a/xfa/src/fee/include/ifde_txtedtbuf.h
+++ b/xfa/src/fee/ifde_txtedtbuf.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTBUF_H_
-#define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTBUF_H_
+#ifndef XFA_SRC_FEE_IFDE_TXTEDTBUF_H_
+#define XFA_SRC_FEE_IFDE_TXTEDTBUF_H_
 
 #include "core/include/fxcrt/fx_basic.h"
 
@@ -36,4 +36,4 @@ class IFDE_TxtEdtBuf {
   virtual FX_BOOL Optimize(IFX_Pause* pPause = NULL) = 0;
 };
 
-#endif  // XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTBUF_H_
+#endif  // XFA_SRC_FEE_IFDE_TXTEDTBUF_H_
diff --git a/xfa/src/fee/include/ifde_txtedtengine.h b/xfa/src/fee/ifde_txtedtengine.h
index d4319d27ee..053fd1ce6b 100644
--- a/xfa/src/fee/include/ifde_txtedtengine.h
+++ b/xfa/src/fee/ifde_txtedtengine.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTENGINE_H_
-#define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTENGINE_H_
+#ifndef XFA_SRC_FEE_IFDE_TXTEDTENGINE_H_
+#define XFA_SRC_FEE_IFDE_TXTEDTENGINE_H_
 
 #include "core/include/fxge/fx_dib.h"
 #include "xfa/src/fgas/include/fx_fnt.h"
@@ -255,4 +255,4 @@ class IFDE_TxtEdtParag {
                             int32_t& nCount) const = 0;
 };
 
-#endif  // XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTENGINE_H_
+#endif  // XFA_SRC_FEE_IFDE_TXTEDTENGINE_H_
diff --git a/xfa/src/fee/include/ifde_txtedtpage.h b/xfa/src/fee/ifde_txtedtpage.h
index 884b752d82..c0236ff0b0 100644
--- a/xfa/src/fee/include/ifde_txtedtpage.h
+++ b/xfa/src/fee/ifde_txtedtpage.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTPAGE_H_
-#define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTPAGE_H_
+#ifndef XFA_SRC_FEE_IFDE_TXTEDTPAGE_H_
+#define XFA_SRC_FEE_IFDE_TXTEDTPAGE_H_
 
 #include "core/include/fxge/fx_ge.h"
 #include "xfa/src/fdp/include/fde_psr.h"
@@ -39,4 +39,4 @@ class IFDE_TxtEdtPage : public IFDE_CanvasSet, public IFX_TxtAccess {
   virtual const CFX_RectF& GetContentsBox() = 0;
 };
 
-#endif  // XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTPAGE_H_
+#endif  // XFA_SRC_FEE_IFDE_TXTEDTPAGE_H_