diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2016-03-09 13:49:00 -0500 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2016-03-09 13:49:00 -0500 |
| commit | 9332e0c2fced598a632e3bbe905b6f63b1f5b06b (patch) | |
| tree | a8957a09cb34ecd28afcd6ebbed309d9c60e4644 /xfa/src/fee | |
| parent | 8388037a5c58d60043b11c03a8efe78c54c65a4b (diff) | |
| download | pdfium-9332e0c2fced598a632e3bbe905b6f63b1f5b06b.tar.xz | |
Cleanup the xfa/src/fgas directory.
This CL moves the code from xfa/src/fgas/src up one level. It then takes the
headers in xfa/src/fgas/include and moves them to their correct folder. The
src/ and include/ directories are then removed.
In some cases, when moving from include/ there was another header with the
same name. Those headers were either folded together, or the content of the
conflicting folder moved to an anonymous namespace in the cpp file as they were
not used anywhere else.
Files with duplicate names as core/src/crt were renamed to be fgas_ instead of
fx_. (e.g. fgas_system.h, fgas_memory.h, fgas_stream.h)
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1776303002 .
Diffstat (limited to 'xfa/src/fee')
| -rw-r--r-- | xfa/src/fee/fde_txtedtbuf.h | 2 | ||||
| -rw-r--r-- | xfa/src/fee/fde_txtedtpage.h | 2 | ||||
| -rw-r--r-- | xfa/src/fee/fde_txtedtparag.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fee/ifde_txtedtengine.h | 2 | ||||
| -rw-r--r-- | xfa/src/fee/ifde_txtedtpage.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/xfa/src/fee/fde_txtedtbuf.h b/xfa/src/fee/fde_txtedtbuf.h index 1b2d19f7e8..9fb6ac1b87 100644 --- a/xfa/src/fee/fde_txtedtbuf.h +++ b/xfa/src/fee/fde_txtedtbuf.h @@ -9,7 +9,7 @@ #include "xfa/src/fee/ifde_txtedtbuf.h" #include "xfa/src/fee/ifde_txtedtengine.h" -#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/crt/fgas_memory.h" class IFX_CharIter; class CFDE_TxtEdtBuf; diff --git a/xfa/src/fee/fde_txtedtpage.h b/xfa/src/fee/fde_txtedtpage.h index e51f80ef8a..520ecb727f 100644 --- a/xfa/src/fee/fde_txtedtpage.h +++ b/xfa/src/fee/fde_txtedtpage.h @@ -11,7 +11,7 @@ #include "core/include/fxcrt/fx_string.h" #include "xfa/src/fdp/include/fde_psr.h" #include "xfa/src/fee/ifde_txtedtpage.h" -#include "xfa/src/fgas/include/fx_utl.h" +#include "xfa/src/fgas/crt/fgas_utils.h" class IFX_CharIter; class CFDE_TxtEdtEngine; diff --git a/xfa/src/fee/fde_txtedtparag.cpp b/xfa/src/fee/fde_txtedtparag.cpp index e5d1d9d3f1..32f846b52b 100644 --- a/xfa/src/fee/fde_txtedtparag.cpp +++ b/xfa/src/fee/fde_txtedtparag.cpp @@ -11,7 +11,7 @@ #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" +#include "xfa/src/fgas/layout/fgas_textbreak.h" CFDE_TxtEdtParag::CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine) : m_nCharStart(0), diff --git a/xfa/src/fee/ifde_txtedtengine.h b/xfa/src/fee/ifde_txtedtengine.h index 053fd1ce6b..f49e086768 100644 --- a/xfa/src/fee/ifde_txtedtengine.h +++ b/xfa/src/fee/ifde_txtedtengine.h @@ -8,7 +8,7 @@ #define XFA_SRC_FEE_IFDE_TXTEDTENGINE_H_ #include "core/include/fxge/fx_dib.h" -#include "xfa/src/fgas/include/fx_fnt.h" +#include "xfa/src/fgas/font/fgas_font.h" class IFDE_TxtEdtPage; class IFDE_TxtEdtEngine; diff --git a/xfa/src/fee/ifde_txtedtpage.h b/xfa/src/fee/ifde_txtedtpage.h index c0236ff0b0..1a4a2fe82f 100644 --- a/xfa/src/fee/ifde_txtedtpage.h +++ b/xfa/src/fee/ifde_txtedtpage.h @@ -9,7 +9,7 @@ #include "core/include/fxge/fx_ge.h" #include "xfa/src/fdp/include/fde_psr.h" -#include "xfa/src/fgas/include/fx_tbk.h" +#include "xfa/src/fgas/layout/fgas_textbreak.h" class IFDE_TxtEdtEngine; class IFDE_TxtEdtPage : public IFDE_CanvasSet, public IFX_TxtAccess { |