Merge the CFWL_*Imp classes into the IFWL_* classes.

BUILD.gn

Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index aa467d5b12dc8b795969ca39d3eca908e080c778..2f3bd9ac200fff21a73c790d18ef0202462e7c19 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1153,49 +1153,6 @@ if (pdf_enable_xfa) {
       "xfa/fgas/localization/fgas_locale.cpp",
       "xfa/fgas/localization/fgas_locale.h",
       "xfa/fgas/localization/fgas_localeimp.h",
-      "xfa/fwl/basewidget/cfx_barcode.cpp",
-      "xfa/fwl/basewidget/cfx_barcode.h",
-      "xfa/fwl/basewidget/fwl_barcodeimp.cpp",
-      "xfa/fwl/basewidget/fwl_barcodeimp.h",
-      "xfa/fwl/basewidget/fwl_caretimp.cpp",
-      "xfa/fwl/basewidget/fwl_caretimp.h",
-      "xfa/fwl/basewidget/fwl_checkboximp.cpp",
-      "xfa/fwl/basewidget/fwl_checkboximp.h",
-      "xfa/fwl/basewidget/fwl_comboboximp.cpp",
-      "xfa/fwl/basewidget/fwl_comboboximp.h",
-      "xfa/fwl/basewidget/fwl_datetimepickerimp.cpp",
-      "xfa/fwl/basewidget/fwl_datetimepickerimp.h",
-      "xfa/fwl/basewidget/fwl_editimp.cpp",
-      "xfa/fwl/basewidget/fwl_editimp.h",
-      "xfa/fwl/basewidget/fwl_formproxyimp.cpp",
-      "xfa/fwl/basewidget/fwl_formproxyimp.h",
-      "xfa/fwl/basewidget/fwl_listboximp.cpp",
-      "xfa/fwl/basewidget/fwl_listboximp.h",
-      "xfa/fwl/basewidget/fwl_monthcalendarimp.cpp",
-      "xfa/fwl/basewidget/fwl_monthcalendarimp.h",
-      "xfa/fwl/basewidget/fwl_pictureboximp.cpp",
-      "xfa/fwl/basewidget/fwl_pictureboximp.h",
-      "xfa/fwl/basewidget/fwl_pushbuttonimp.cpp",
-      "xfa/fwl/basewidget/fwl_pushbuttonimp.h",
-      "xfa/fwl/basewidget/fwl_scrollbarimp.cpp",
-      "xfa/fwl/basewidget/fwl_scrollbarimp.h",
-      "xfa/fwl/basewidget/fwl_spinbuttonimp.cpp",
-      "xfa/fwl/basewidget/fwl_spinbuttonimp.h",
-      "xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp",
-      "xfa/fwl/basewidget/fwl_tooltipctrlimp.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/core/cfwl_event.h",
       "xfa/fwl/core/cfwl_message.h",
       "xfa/fwl/core/cfwl_themebackground.h",
@@ -1204,23 +1161,59 @@ if (pdf_enable_xfa) {
       "xfa/fwl/core/cfwl_widgetimpproperties.h",
       "xfa/fwl/core/cfwl_widgetmgr.cpp",
       "xfa/fwl/core/cfwl_widgetmgr.h",
+      "xfa/fwl/core/cfx_barcode.cpp",
+      "xfa/fwl/core/cfx_barcode.h",
       "xfa/fwl/core/fwl_error.h",
-      "xfa/fwl/core/fwl_formimp.cpp",
-      "xfa/fwl/core/fwl_formimp.h",
       "xfa/fwl/core/fwl_noteimp.cpp",
       "xfa/fwl/core/fwl_noteimp.h",
-      "xfa/fwl/core/fwl_timerimp.cpp",
       "xfa/fwl/core/fwl_widgetdef.h",
       "xfa/fwl/core/fwl_widgethit.h",
-      "xfa/fwl/core/fwl_widgetimp.cpp",
-      "xfa/fwl/core/fwl_widgetimp.h",
       "xfa/fwl/core/ifwl_adaptertimermgr.h",
       "xfa/fwl/core/ifwl_app.cpp",
       "xfa/fwl/core/ifwl_app.h",
+      "xfa/fwl/core/ifwl_barcode.cpp",
+      "xfa/fwl/core/ifwl_barcode.h",
+      "xfa/fwl/core/ifwl_caret.cpp",
+      "xfa/fwl/core/ifwl_caret.h",
+      "xfa/fwl/core/ifwl_checkbox.cpp",
+      "xfa/fwl/core/ifwl_checkbox.h",
+      "xfa/fwl/core/ifwl_combobox.cpp",
+      "xfa/fwl/core/ifwl_combobox.h",
+      "xfa/fwl/core/ifwl_comboedit.cpp",
+      "xfa/fwl/core/ifwl_comboedit.h",
+      "xfa/fwl/core/ifwl_combolist.cpp",
+      "xfa/fwl/core/ifwl_combolist.h",
       "xfa/fwl/core/ifwl_dataprovider.h",
+      "xfa/fwl/core/ifwl_datetimecalendar.cpp",
+      "xfa/fwl/core/ifwl_datetimecalendar.h",
+      "xfa/fwl/core/ifwl_datetimeedit.cpp",
+      "xfa/fwl/core/ifwl_datetimeedit.h",
+      "xfa/fwl/core/ifwl_datetimepicker.cpp",
+      "xfa/fwl/core/ifwl_datetimepicker.h",
+      "xfa/fwl/core/ifwl_edit.cpp",
+      "xfa/fwl/core/ifwl_edit.h",
+      "xfa/fwl/core/ifwl_form.cpp",
       "xfa/fwl/core/ifwl_form.h",
+      "xfa/fwl/core/ifwl_formproxy.cpp",
+      "xfa/fwl/core/ifwl_formproxy.h",
+      "xfa/fwl/core/ifwl_listbox.cpp",
+      "xfa/fwl/core/ifwl_listbox.h",
+      "xfa/fwl/core/ifwl_monthcalendar.cpp",
+      "xfa/fwl/core/ifwl_monthcalendar.h",
+      "xfa/fwl/core/ifwl_picturebox.cpp",
+      "xfa/fwl/core/ifwl_picturebox.h",
+      "xfa/fwl/core/ifwl_pushbutton.cpp",
+      "xfa/fwl/core/ifwl_pushbutton.h",
+      "xfa/fwl/core/ifwl_scrollbar.cpp",
+      "xfa/fwl/core/ifwl_scrollbar.h",
+      "xfa/fwl/core/ifwl_spinbutton.cpp",
+      "xfa/fwl/core/ifwl_spinbutton.h",
       "xfa/fwl/core/ifwl_themeprovider.h",
+      "xfa/fwl/core/ifwl_timer.cpp",
       "xfa/fwl/core/ifwl_timer.h",
+      "xfa/fwl/core/ifwl_tooltip.cpp",
+      "xfa/fwl/core/ifwl_tooltip.h",
+      "xfa/fwl/core/ifwl_widget.cpp",
       "xfa/fwl/core/ifwl_widget.h",
       "xfa/fwl/core/ifwl_widgetdelegate.h",
       "xfa/fwl/lightwidget/cfwl_barcode.cpp",