Remove xfa/src/fxfa/src/common and xfa/src/fxfa/src

This Cl moves the code in xfa/src/fxfa/src/common to the diretory which
contains the respective implementations and removes the xfa/src/fxfa/src/common
directory. It them moves all of the code in xfa/src/fxfa/src up one level and
removes the xfa/src/fxfa/src
directory.

R=tsepez@chromium.org

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

1 files changed, 129 insertions, 129 deletions

diff --git a/xfa.gyp b/xfa.gyp
index d3fb24d8e4..52fe97ea13 100644
--- a/xfa.gyp
+++ b/xfa.gyp
@@ -520,135 +520,135 @@
         "xfa/src/fxbarcode/BC_UtilRSS.h",
         "xfa/src/fxbarcode/BC_Writer.h",
         "xfa/src/fxbarcode/utils.h",
-        "xfa/src/fxfa/src/app/xfa_checksum.cpp",
-        "xfa/src/fxfa/src/app/xfa_checksum.h",
-        "xfa/src/fxfa/src/app/xfa_ffapp.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffapp.h",
-        "xfa/src/fxfa/src/app/xfa_ffbarcode.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffbarcode.h",
-        "xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h",
-        "xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffchoicelist.h",
-        "xfa/src/fxfa/src/app/xfa_ffdoc.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffdoc.h",
-        "xfa/src/fxfa/src/app/xfa_ffdochandler.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffdochandler.h",
-        "xfa/src/fxfa/src/app/xfa_ffdocview.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffdocview.h",
-        "xfa/src/fxfa/src/app/xfa_ffdraw.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffdraw.h",
-        "xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffexclgroup.h",
-        "xfa/src/fxfa/src/app/xfa_fffield.cpp",
-        "xfa/src/fxfa/src/app/xfa_fffield.h",
-        "xfa/src/fxfa/src/app/xfa_ffimage.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffimage.h",
-        "xfa/src/fxfa/src/app/xfa_ffimageedit.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffimageedit.h",
-        "xfa/src/fxfa/src/app/xfa_ffnotify.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffnotify.h",
-        "xfa/src/fxfa/src/app/xfa_ffpageview.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffpageview.h",
-        "xfa/src/fxfa/src/app/xfa_ffpath.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffpath.h",
-        "xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffpushbutton.h",
-        "xfa/src/fxfa/src/app/xfa_ffsignature.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffsignature.h",
-        "xfa/src/fxfa/src/app/xfa_ffsubform.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffsubform.h",
-        "xfa/src/fxfa/src/app/xfa_fftext.cpp",
-        "xfa/src/fxfa/src/app/xfa_fftext.h",
-        "xfa/src/fxfa/src/app/xfa_fftextedit.cpp",
-        "xfa/src/fxfa/src/app/xfa_fftextedit.h",
-        "xfa/src/fxfa/src/app/xfa_ffwidget.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffwidget.h",
-        "xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h",
-        "xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp",
-        "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h",
-        "xfa/src/fxfa/src/app/xfa_fontmgr.cpp",
-        "xfa/src/fxfa/src/app/xfa_fontmgr.h",
-        "xfa/src/fxfa/src/app/xfa_fwladapter.cpp",
-        "xfa/src/fxfa/src/app/xfa_fwladapter.h",
-        "xfa/src/fxfa/src/app/xfa_fwltheme.cpp",
-        "xfa/src/fxfa/src/app/xfa_fwltheme.h",
-        "xfa/src/fxfa/src/app/xfa_rendercontext.cpp",
-        "xfa/src/fxfa/src/app/xfa_rendercontext.h",
-        "xfa/src/fxfa/src/app/xfa_textlayout.cpp",
-        "xfa/src/fxfa/src/app/xfa_textlayout.h",
-        "xfa/src/fxfa/src/common/fxfa_localevalue.h",
-        "xfa/src/fxfa/src/common/xfa_docdata.h",
-        "xfa/src/fxfa/src/common/xfa_doclayout.h",
-        "xfa/src/fxfa/src/common/xfa_document.h",
-        "xfa/src/fxfa/src/common/xfa_fm2jsapi.h",
-        "xfa/src/fxfa/src/common/xfa_localemgr.h",
-        "xfa/src/fxfa/src/common/xfa_object.h",
-        "xfa/src/fxfa/src/common/xfa_parser.h",
-        "xfa/src/fxfa/src/common/xfa_script.h",
-        "xfa/src/fxfa/src/common/xfa_utils.h",
-        "xfa/src/fxfa/src/fm2js/xfa_error.cpp",
-        "xfa/src/fxfa/src/fm2js/xfa_error.h",
-        "xfa/src/fxfa/src/fm2js/xfa_expression.cpp",
-        "xfa/src/fxfa/src/fm2js/xfa_expression.h",
-        "xfa/src/fxfa/src/fm2js/xfa_fm2jsapi.cpp",
-        "xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp",
-        "xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h",
-        "xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp",
-        "xfa/src/fxfa/src/fm2js/xfa_fmparse.h",
-        "xfa/src/fxfa/src/fm2js/xfa_lexer.cpp",
-        "xfa/src/fxfa/src/fm2js/xfa_lexer.h",
-        "xfa/src/fxfa/src/fm2js/xfa_program.cpp",
-        "xfa/src/fxfa/src/fm2js/xfa_program.h",
-        "xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp",
-        "xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h",
-        "xfa/src/fxfa/src/parser/xfa_basic_data.cpp",
-        "xfa/src/fxfa/src/parser/xfa_basic_data.h",
-        "xfa/src/fxfa/src/parser/xfa_basic_imp.cpp",
-        "xfa/src/fxfa/src/parser/xfa_basic_imp.h",
-        "xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp",
-        "xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h",
-        "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp",
-        "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h",
-        "xfa/src/fxfa/src/parser/xfa_document_imp.cpp",
-        "xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp",
-        "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h",
-        "xfa/src/fxfa/src/parser/xfa_document_serialize.cpp",
-        "xfa/src/fxfa/src/parser/xfa_document_serialize.h",
-        "xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp",
-        "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h",
-        "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp",
-        "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h",
-        "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp",
-        "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h",
-        "xfa/src/fxfa/src/parser/xfa_locale.cpp",
-        "xfa/src/fxfa/src/parser/xfa_locale.h",
-        "xfa/src/fxfa/src/parser/xfa_localemgr.cpp",
-        "xfa/src/fxfa/src/parser/xfa_localevalue.cpp",
-        "xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp",
-        "xfa/src/fxfa/src/parser/xfa_object_imp.cpp",
-        "xfa/src/fxfa/src/parser/xfa_parser_imp.cpp",
-        "xfa/src/fxfa/src/parser/xfa_parser_imp.h",
-        "xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp",
-        "xfa/src/fxfa/src/parser/xfa_script_datawindow.h",
-        "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp",
-        "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h",
-        "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp",
-        "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h",
-        "xfa/src/fxfa/src/parser/xfa_script_imp.cpp",
-        "xfa/src/fxfa/src/parser/xfa_script_imp.h",
-        "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp",
-        "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h",
-        "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp",
-        "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h",
-        "xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp",
-        "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h",
-        "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp",
-        "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h",
-        "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp",
-        "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h",
-        "xfa/src/fxfa/src/parser/xfa_utils_imp.cpp",
+        "xfa/src/fxfa/app/xfa_checksum.cpp",
+        "xfa/src/fxfa/app/xfa_checksum.h",
+        "xfa/src/fxfa/app/xfa_ffapp.cpp",
+        "xfa/src/fxfa/app/xfa_ffapp.h",
+        "xfa/src/fxfa/app/xfa_ffbarcode.cpp",
+        "xfa/src/fxfa/app/xfa_ffbarcode.h",
+        "xfa/src/fxfa/app/xfa_ffcheckbutton.cpp",
+        "xfa/src/fxfa/app/xfa_ffcheckbutton.h",
+        "xfa/src/fxfa/app/xfa_ffchoicelist.cpp",
+        "xfa/src/fxfa/app/xfa_ffchoicelist.h",
+        "xfa/src/fxfa/app/xfa_ffdoc.cpp",
+        "xfa/src/fxfa/app/xfa_ffdoc.h",
+        "xfa/src/fxfa/app/xfa_ffdochandler.cpp",
+        "xfa/src/fxfa/app/xfa_ffdochandler.h",
+        "xfa/src/fxfa/app/xfa_ffdocview.cpp",
+        "xfa/src/fxfa/app/xfa_ffdocview.h",
+        "xfa/src/fxfa/app/xfa_ffdraw.cpp",
+        "xfa/src/fxfa/app/xfa_ffdraw.h",
+        "xfa/src/fxfa/app/xfa_ffexclgroup.cpp",
+        "xfa/src/fxfa/app/xfa_ffexclgroup.h",
+        "xfa/src/fxfa/app/xfa_fffield.cpp",
+        "xfa/src/fxfa/app/xfa_fffield.h",
+        "xfa/src/fxfa/app/xfa_ffimage.cpp",
+        "xfa/src/fxfa/app/xfa_ffimage.h",
+        "xfa/src/fxfa/app/xfa_ffimageedit.cpp",
+        "xfa/src/fxfa/app/xfa_ffimageedit.h",
+        "xfa/src/fxfa/app/xfa_ffnotify.cpp",
+        "xfa/src/fxfa/app/xfa_ffnotify.h",
+        "xfa/src/fxfa/app/xfa_ffpageview.cpp",
+        "xfa/src/fxfa/app/xfa_ffpageview.h",
+        "xfa/src/fxfa/app/xfa_ffpath.cpp",
+        "xfa/src/fxfa/app/xfa_ffpath.h",
+        "xfa/src/fxfa/app/xfa_ffpushbutton.cpp",
+        "xfa/src/fxfa/app/xfa_ffpushbutton.h",
+        "xfa/src/fxfa/app/xfa_ffsignature.cpp",
+        "xfa/src/fxfa/app/xfa_ffsignature.h",
+        "xfa/src/fxfa/app/xfa_ffsubform.cpp",
+        "xfa/src/fxfa/app/xfa_ffsubform.h",
+        "xfa/src/fxfa/app/xfa_fftext.cpp",
+        "xfa/src/fxfa/app/xfa_fftext.h",
+        "xfa/src/fxfa/app/xfa_fftextedit.cpp",
+        "xfa/src/fxfa/app/xfa_fftextedit.h",
+        "xfa/src/fxfa/app/xfa_ffwidget.cpp",
+        "xfa/src/fxfa/app/xfa_ffwidget.h",
+        "xfa/src/fxfa/app/xfa_ffwidgetacc.cpp",
+        "xfa/src/fxfa/app/xfa_ffwidgetacc.h",
+        "xfa/src/fxfa/app/xfa_ffwidgethandler.cpp",
+        "xfa/src/fxfa/app/xfa_ffwidgethandler.h",
+        "xfa/src/fxfa/app/xfa_fontmgr.cpp",
+        "xfa/src/fxfa/app/xfa_fontmgr.h",
+        "xfa/src/fxfa/app/xfa_fwladapter.cpp",
+        "xfa/src/fxfa/app/xfa_fwladapter.h",
+        "xfa/src/fxfa/app/xfa_fwltheme.cpp",
+        "xfa/src/fxfa/app/xfa_fwltheme.h",
+        "xfa/src/fxfa/app/xfa_rendercontext.cpp",
+        "xfa/src/fxfa/app/xfa_rendercontext.h",
+        "xfa/src/fxfa/app/xfa_textlayout.cpp",
+        "xfa/src/fxfa/app/xfa_textlayout.h",
+        "xfa/src/fxfa/fm2js/xfa_error.cpp",
+        "xfa/src/fxfa/fm2js/xfa_error.h",
+        "xfa/src/fxfa/fm2js/xfa_expression.cpp",
+        "xfa/src/fxfa/fm2js/xfa_expression.h",
+        "xfa/src/fxfa/fm2js/xfa_fm2jsapi.cpp",
+        "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h",
+        "xfa/src/fxfa/fm2js/xfa_fm2jscontext.cpp",
+        "xfa/src/fxfa/fm2js/xfa_fm2jscontext.h",
+        "xfa/src/fxfa/fm2js/xfa_fmparse.cpp",
+        "xfa/src/fxfa/fm2js/xfa_fmparse.h",
+        "xfa/src/fxfa/fm2js/xfa_lexer.cpp",
+        "xfa/src/fxfa/fm2js/xfa_lexer.h",
+        "xfa/src/fxfa/fm2js/xfa_program.cpp",
+        "xfa/src/fxfa/fm2js/xfa_program.h",
+        "xfa/src/fxfa/fm2js/xfa_simpleexpression.cpp",
+        "xfa/src/fxfa/fm2js/xfa_simpleexpression.h",
+        "xfa/src/fxfa/parser/xfa_basic_data.cpp",
+        "xfa/src/fxfa/parser/xfa_basic_data.h",
+        "xfa/src/fxfa/parser/xfa_basic_imp.cpp",
+        "xfa/src/fxfa/parser/xfa_basic_imp.h",
+        "xfa/src/fxfa/parser/xfa_docdata.h",
+        "xfa/src/fxfa/parser/xfa_doclayout.h",
+        "xfa/src/fxfa/parser/xfa_document.h",
+        "xfa/src/fxfa/parser/xfa_document_datadescription_imp.cpp",
+        "xfa/src/fxfa/parser/xfa_document_datadescription_imp.h",
+        "xfa/src/fxfa/parser/xfa_document_datamerger_imp.cpp",
+        "xfa/src/fxfa/parser/xfa_document_datamerger_imp.h",
+        "xfa/src/fxfa/parser/xfa_document_imp.cpp",
+        "xfa/src/fxfa/parser/xfa_document_layout_imp.cpp",
+        "xfa/src/fxfa/parser/xfa_document_layout_imp.h",
+        "xfa/src/fxfa/parser/xfa_document_serialize.cpp",
+        "xfa/src/fxfa/parser/xfa_document_serialize.h",
+        "xfa/src/fxfa/parser/xfa_layout_appadapter.cpp",
+        "xfa/src/fxfa/parser/xfa_layout_appadapter.h",
+        "xfa/src/fxfa/parser/xfa_layout_itemlayout.cpp",
+        "xfa/src/fxfa/parser/xfa_layout_itemlayout.h",
+        "xfa/src/fxfa/parser/xfa_layout_pagemgr_new.cpp",
+        "xfa/src/fxfa/parser/xfa_layout_pagemgr_new.h",
+        "xfa/src/fxfa/parser/xfa_locale.cpp",
+        "xfa/src/fxfa/parser/xfa_locale.h",
+        "xfa/src/fxfa/parser/xfa_localemgr.cpp",
+        "xfa/src/fxfa/parser/xfa_localemgr.h",
+        "xfa/src/fxfa/parser/xfa_localevalue.cpp",
+        "xfa/src/fxfa/parser/xfa_localevalue.h",
+        "xfa/src/fxfa/parser/xfa_object.h",
+        "xfa/src/fxfa/parser/xfa_objectacc_imp.cpp",
+        "xfa/src/fxfa/parser/xfa_object_imp.cpp",
+        "xfa/src/fxfa/parser/xfa_parser.h",
+        "xfa/src/fxfa/parser/xfa_parser_imp.cpp",
+        "xfa/src/fxfa/parser/xfa_parser_imp.h",
+        "xfa/src/fxfa/parser/xfa_script.h",
+        "xfa/src/fxfa/parser/xfa_script_datawindow.cpp",
+        "xfa/src/fxfa/parser/xfa_script_datawindow.h",
+        "xfa/src/fxfa/parser/xfa_script_eventpseudomodel.cpp",
+        "xfa/src/fxfa/parser/xfa_script_eventpseudomodel.h",
+        "xfa/src/fxfa/parser/xfa_script_hostpseudomodel.cpp",
+        "xfa/src/fxfa/parser/xfa_script_hostpseudomodel.h",
+        "xfa/src/fxfa/parser/xfa_script_imp.cpp",
+        "xfa/src/fxfa/parser/xfa_script_imp.h",
+        "xfa/src/fxfa/parser/xfa_script_layoutpseudomodel.cpp",
+        "xfa/src/fxfa/parser/xfa_script_layoutpseudomodel.h",
+        "xfa/src/fxfa/parser/xfa_script_logpseudomodel.cpp",
+        "xfa/src/fxfa/parser/xfa_script_logpseudomodel.h",
+        "xfa/src/fxfa/parser/xfa_script_nodehelper.cpp",
+        "xfa/src/fxfa/parser/xfa_script_nodehelper.h",
+        "xfa/src/fxfa/parser/xfa_script_resolveprocessor.cpp",
+        "xfa/src/fxfa/parser/xfa_script_resolveprocessor.h",
+        "xfa/src/fxfa/parser/xfa_script_signaturepseudomodel.cpp",
+        "xfa/src/fxfa/parser/xfa_script_signaturepseudomodel.h",
+        "xfa/src/fxfa/parser/xfa_utils.h",
+        "xfa/src/fxfa/parser/xfa_utils_imp.cpp",
         "xfa/src/fxgraphics/src/fx_graphics.cpp",
         "xfa/src/fxgraphics/src/fx_path_generator.cpp",
         "xfa/src/fxgraphics/src/fx_path_generator.h",