Move xfa/include/fwl/{core,basewidget} to xfa/fwl/{core,basewidget}.

BUILD.gn

Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 753e5a72be5b6abf64ec4a410e9678c6b78d1aa8..862929f28ff49ba2ccc7e7f0010d76de2d0a4f03 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -981,10 +981,32 @@ if (pdf_enable_xfa) {
       "xfa/fwl/basewidget/fwl_tooltipctrlimp.h",
       "xfa/fwl/basewidget/fxmath_barcodeimp.cpp",
       "xfa/fwl/basewidget/fxmath_barcodeimp.h",
+      "xfa/fwl/basewidget/ifwl_barcode.h",
+      "xfa/fwl/basewidget/ifwl_caret.h",
+      "xfa/fwl/basewidget/ifwl_checkbox.h",
+      "xfa/fwl/basewidget/ifwl_combobox.h",
+      "xfa/fwl/basewidget/ifwl_datetimepicker.h",
+      "xfa/fwl/basewidget/ifwl_edit.h",
+      "xfa/fwl/basewidget/ifwl_listbox.h",
+      "xfa/fwl/basewidget/ifwl_monthcalendar.h",
+      "xfa/fwl/basewidget/ifwl_picturebox.h",
+      "xfa/fwl/basewidget/ifwl_pushbutton.h",
+      "xfa/fwl/basewidget/ifwl_scrollbar.h",
+      "xfa/fwl/basewidget/ifwl_spinbutton.h",
+      "xfa/fwl/basewidget/ifwl_tooltip.h",
+      "xfa/fwl/basewidget/ifx_barcode.h",
+      "xfa/fwl/core/cfwl_event.h",
+      "xfa/fwl/core/cfwl_message.h",
+      "xfa/fwl/core/cfwl_note.h",
+      "xfa/fwl/core/cfwl_themebackground.h",
+      "xfa/fwl/core/cfwl_themepart.h",
+      "xfa/fwl/core/cfwl_themetext.h",
+      "xfa/fwl/core/cfwl_widgetimpproperties.h",
       "xfa/fwl/core/fwl_appimp.cpp",
       "xfa/fwl/core/fwl_appimp.h",
       "xfa/fwl/core/fwl_contentimp.cpp",
       "xfa/fwl/core/fwl_contentimp.h",
+      "xfa/fwl/core/fwl_error.h",
       "xfa/fwl/core/fwl_formimp.cpp",
       "xfa/fwl/core/fwl_formimp.h",
       "xfa/fwl/core/fwl_gridimp.cpp",
@@ -994,15 +1016,42 @@ if (pdf_enable_xfa) {
       "xfa/fwl/core/fwl_panelimp.cpp",
       "xfa/fwl/core/fwl_panelimp.h",
       "xfa/fwl/core/fwl_sdadapterimp.cpp",
+      "xfa/fwl/core/fwl_sdadapterimp.h",
       "xfa/fwl/core/fwl_targetimp.cpp",
       "xfa/fwl/core/fwl_targetimp.h",
       "xfa/fwl/core/fwl_threadimp.cpp",
       "xfa/fwl/core/fwl_threadimp.h",
       "xfa/fwl/core/fwl_timerimp.cpp",
+      "xfa/fwl/core/fwl_widgetdef.h",
       "xfa/fwl/core/fwl_widgetimp.cpp",
       "xfa/fwl/core/fwl_widgetimp.h",
       "xfa/fwl/core/fwl_widgetmgrimp.cpp",
       "xfa/fwl/core/fwl_widgetmgrimp.h",
+      "xfa/fwl/core/ifwl_adapternative.h",
+      "xfa/fwl/core/ifwl_adapterthreadmgr.h",
+      "xfa/fwl/core/ifwl_adapterwidgetmgr.h",
+      "xfa/fwl/core/ifwl_app.h",
+      "xfa/fwl/core/ifwl_content.h",
+      "xfa/fwl/core/ifwl_custom.h",
+      "xfa/fwl/core/ifwl_custompanel.h",
+      "xfa/fwl/core/ifwl_dataprovider.h",
+      "xfa/fwl/core/ifwl_form.h",
+      "xfa/fwl/core/ifwl_grid.h",
+      "xfa/fwl/core/ifwl_notedriver.h",
+      "xfa/fwl/core/ifwl_noteloop.h",
+      "xfa/fwl/core/ifwl_notethread.h",
+      "xfa/fwl/core/ifwl_panel.h",
+      "xfa/fwl/core/ifwl_proxy.h",
+      "xfa/fwl/core/ifwl_target.h",
+      "xfa/fwl/core/ifwl_themeprovider.h",
+      "xfa/fwl/core/ifwl_thread.h",
+      "xfa/fwl/core/ifwl_timer.h",
+      "xfa/fwl/core/ifwl_tooltiptarget.h",
+      "xfa/fwl/core/ifwl_widget.h",
+      "xfa/fwl/core/ifwl_widgetdelegate.h",
+      "xfa/fwl/core/ifwl_widgetmgr.h",
+      "xfa/fwl/core/ifwl_widgetmgrdelegate.h",
+      "xfa/fwl/core/include/ifwl_adaptertimermgr.h",
       "xfa/fwl/lightwidget/app.cpp",
       "xfa/fwl/lightwidget/barcode.cpp",
       "xfa/fwl/lightwidget/caret.cpp",
@@ -1433,40 +1482,6 @@ if (pdf_enable_xfa) {
       "xfa/fxgraphics/cfx_shading.h",
       "xfa/fxgraphics/include/cfx_graphics.h",
       "xfa/fxjse/include/fxjse.h",
-      "xfa/include/fwl/adapter/fwl_adapternative.h",
-      "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h",
-      "xfa/include/fwl/adapter/fwl_adaptertimermgr.h",
-      "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h",
-      "xfa/include/fwl/adapter/fwl_sdadapterimp.h",
-      "xfa/include/fwl/basewidget/fwl_barcode.h",
-      "xfa/include/fwl/basewidget/fwl_caret.h",
-      "xfa/include/fwl/basewidget/fwl_checkbox.h",
-      "xfa/include/fwl/basewidget/fwl_combobox.h",
-      "xfa/include/fwl/basewidget/fwl_datetimepicker.h",
-      "xfa/include/fwl/basewidget/fwl_edit.h",
-      "xfa/include/fwl/basewidget/fwl_listbox.h",
-      "xfa/include/fwl/basewidget/fwl_menu.h",
-      "xfa/include/fwl/basewidget/fwl_monthcalendar.h",
-      "xfa/include/fwl/basewidget/fwl_picturebox.h",
-      "xfa/include/fwl/basewidget/fwl_pushbutton.h",
-      "xfa/include/fwl/basewidget/fwl_scrollbar.h",
-      "xfa/include/fwl/basewidget/fwl_spinbutton.h",
-      "xfa/include/fwl/basewidget/fwl_tooltipctrl.h",
-      "xfa/include/fwl/basewidget/fxmath_barcode.h",
-      "xfa/include/fwl/core/fwl_app.h",
-      "xfa/include/fwl/core/fwl_content.h",
-      "xfa/include/fwl/core/fwl_error.h",
-      "xfa/include/fwl/core/fwl_form.h",
-      "xfa/include/fwl/core/fwl_grid.h",
-      "xfa/include/fwl/core/fwl_note.h",
-      "xfa/include/fwl/core/fwl_panel.h",
-      "xfa/include/fwl/core/fwl_target.h",
-      "xfa/include/fwl/core/fwl_theme.h",
-      "xfa/include/fwl/core/fwl_thread.h",
-      "xfa/include/fwl/core/fwl_timer.h",
-      "xfa/include/fwl/core/fwl_widget.h",
-      "xfa/include/fwl/core/fwl_widgetdef.h",
-      "xfa/include/fwl/core/fwl_widgetmgr.h",
       "xfa/include/fwl/lightwidget/app.h",
       "xfa/include/fwl/lightwidget/barcode.h",
       "xfa/include/fwl/lightwidget/caret.h",