From a94566f3833b885019bbea76d3261a3050b5ed04 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 30 Aug 2017 16:36:53 -0400 Subject: Move CFX_WideTextBuf out of fx_basic This CL moves CFX_WideTextBuf to its own files and updates includes as needed. Change-Id: Ibe66ecf3e66f8f01dd8e9eaf6b467588be86ad4f Reviewed-on: https://pdfium-review.googlesource.com/12413 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp | 1 + xfa/fxfa/fm2js/cxfa_fm2jscontext.h | 1 + xfa/fxfa/fm2js/cxfa_fmexpression.cpp | 2 +- xfa/fxfa/fm2js/cxfa_fmexpression.h | 2 ++ xfa/fxfa/fm2js/cxfa_fmparser_unittest.cpp | 1 + xfa/fxfa/fm2js/cxfa_fmsimpleexpression.cpp | 1 + xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h | 3 ++- xfa/fxfa/fm2js/cxfa_fmsimpleexpression_unittest.cpp | 1 + xfa/fxfa/parser/cxfa_dataexporter.cpp | 2 +- xfa/fxfa/parser/cxfa_scriptcontext.cpp | 1 + xfa/fxfa/parser/cxfa_simple_parser.cpp | 1 + 11 files changed, 13 insertions(+), 3 deletions(-) (limited to 'xfa') diff --git a/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp index 944dfea7d0..73e6c221dc 100644 --- a/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp +++ b/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp @@ -12,6 +12,7 @@ #include #include "core/fxcrt/cfx_decimal.h" +#include "core/fxcrt/cfx_widetextbuf.h" #include "core/fxcrt/fx_extension.h" #include "fxjs/cfxjse_arguments.h" #include "fxjs/cfxjse_class.h" diff --git a/xfa/fxfa/fm2js/cxfa_fm2jscontext.h b/xfa/fxfa/fm2js/cxfa_fm2jscontext.h index abc9548429..37586d080e 100644 --- a/xfa/fxfa/fm2js/cxfa_fm2jscontext.h +++ b/xfa/fxfa/fm2js/cxfa_fm2jscontext.h @@ -14,6 +14,7 @@ #include "fxjs/cfxjse_context.h" #include "xfa/fxfa/parser/xfa_resolvenode_rs.h" +class CFX_WideTextBuf; class CXFA_Document; class CXFA_FM2JSContext : public CFXJSE_HostObject { diff --git a/xfa/fxfa/fm2js/cxfa_fmexpression.cpp b/xfa/fxfa/fm2js/cxfa_fmexpression.cpp index e323a330dc..2faa1914b1 100644 --- a/xfa/fxfa/fm2js/cxfa_fmexpression.cpp +++ b/xfa/fxfa/fm2js/cxfa_fmexpression.cpp @@ -8,7 +8,7 @@ #include -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/cfx_widetextbuf.h" namespace { diff --git a/xfa/fxfa/fm2js/cxfa_fmexpression.h b/xfa/fxfa/fm2js/cxfa_fmexpression.h index b2bbc43968..47b2d9cabd 100644 --- a/xfa/fxfa/fm2js/cxfa_fmexpression.h +++ b/xfa/fxfa/fm2js/cxfa_fmexpression.h @@ -23,6 +23,8 @@ enum XFA_FM_EXPTYPE { XFA_FM_EXPTYPE_CONTINUE, }; +class CFX_WideTextBuf; + class CXFA_FMExpression { public: explicit CXFA_FMExpression(uint32_t line); diff --git a/xfa/fxfa/fm2js/cxfa_fmparser_unittest.cpp b/xfa/fxfa/fm2js/cxfa_fmparser_unittest.cpp index 4a17067087..a7e784e63d 100644 --- a/xfa/fxfa/fm2js/cxfa_fmparser_unittest.cpp +++ b/xfa/fxfa/fm2js/cxfa_fmparser_unittest.cpp @@ -6,6 +6,7 @@ #include +#include "core/fxcrt/cfx_widetextbuf.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" #include "third_party/base/ptr_util.h" diff --git a/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.cpp b/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.cpp index c30c44aa64..fc07609f85 100644 --- a/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.cpp +++ b/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.cpp @@ -9,6 +9,7 @@ #include #include +#include "core/fxcrt/cfx_widetextbuf.h" #include "core/fxcrt/fx_extension.h" #include "third_party/base/logging.h" diff --git a/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h b/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h index e47334926d..a9e9f90289 100644 --- a/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h +++ b/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h @@ -10,7 +10,6 @@ #include #include -#include "core/fxcrt/fx_basic.h" #include "xfa/fxfa/fm2js/cxfa_fmlexer.h" #define RUNTIMEFUNCTIONRETURNVALUE L"pfm_ret" @@ -44,6 +43,8 @@ enum XFA_FM_SimpleExpressionType { VARFILTER }; +class CFX_WideTextBuf; + CFX_WideStringC XFA_FM_EXPTypeToString( XFA_FM_SimpleExpressionType simpleExpType); diff --git a/xfa/fxfa/fm2js/cxfa_fmsimpleexpression_unittest.cpp b/xfa/fxfa/fm2js/cxfa_fmsimpleexpression_unittest.cpp index 18a67f4c39..c465c96ff0 100644 --- a/xfa/fxfa/fm2js/cxfa_fmsimpleexpression_unittest.cpp +++ b/xfa/fxfa/fm2js/cxfa_fmsimpleexpression_unittest.cpp @@ -7,6 +7,7 @@ #include #include +#include "core/fxcrt/cfx_widetextbuf.h" #include "core/fxcrt/fx_string.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" diff --git a/xfa/fxfa/parser/cxfa_dataexporter.cpp b/xfa/fxfa/parser/cxfa_dataexporter.cpp index 05586e12dd..0af9bd47f1 100644 --- a/xfa/fxfa/parser/cxfa_dataexporter.cpp +++ b/xfa/fxfa/parser/cxfa_dataexporter.cpp @@ -9,7 +9,7 @@ #include #include "core/fxcrt/cfx_memorystream.h" -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/cfx_widetextbuf.h" #include "core/fxcrt/fx_codepage.h" #include "core/fxcrt/xml/cfx_xmldoc.h" #include "core/fxcrt/xml/cfx_xmlelement.h" diff --git a/xfa/fxfa/parser/cxfa_scriptcontext.cpp b/xfa/fxfa/parser/cxfa_scriptcontext.cpp index 24b1e3c9fe..e7c86296ee 100644 --- a/xfa/fxfa/parser/cxfa_scriptcontext.cpp +++ b/xfa/fxfa/parser/cxfa_scriptcontext.cpp @@ -9,6 +9,7 @@ #include #include "core/fxcrt/cfx_autorestorer.h" +#include "core/fxcrt/cfx_widetextbuf.h" #include "core/fxcrt/fx_extension.h" #include "fxjs/cfxjse_arguments.h" #include "fxjs/cfxjse_class.h" diff --git a/xfa/fxfa/parser/cxfa_simple_parser.cpp b/xfa/fxfa/parser/cxfa_simple_parser.cpp index ee2a2444fc..dd72f40d56 100644 --- a/xfa/fxfa/parser/cxfa_simple_parser.cpp +++ b/xfa/fxfa/parser/cxfa_simple_parser.cpp @@ -11,6 +11,7 @@ #include "core/fxcrt/cfx_checksumcontext.h" #include "core/fxcrt/cfx_seekablestreamproxy.h" +#include "core/fxcrt/cfx_widetextbuf.h" #include "core/fxcrt/fx_codepage.h" #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/xml/cfx_xmlchardata.h" -- cgit v1.2.3