Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_form.cpp

Index: xfa/fwl/cfwl_form.cpp
diff --git a/xfa/fwl/core/cfwl_form.cpp b/xfa/fwl/cfwl_form.cpp
similarity index 95%
rename from xfa/fwl/core/cfwl_form.cpp
rename to xfa/fwl/cfwl_form.cpp
index 5b494fe1e22c73ea40e127add6b41f8163f17599..624957163f0a79045d008e20b99637b3de2cab92 100644
--- a/xfa/fwl/core/cfwl_form.cpp
+++ b/xfa/fwl/cfwl_form.cpp
@@ -4,24 +4,24 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_form.h"
+#include "xfa/fwl/cfwl_form.h"
 
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/tto/fde_textout.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_formproxy.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_noteloop.h"
-#include "xfa/fwl/core/cfwl_sysbtn.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
-#include "xfa/fwl/core/cfwl_themetext.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_formproxy.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_noteloop.h"
+#include "xfa/fwl/cfwl_sysbtn.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_themetext.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 #include "xfa/fwl/theme/cfwl_widgettp.h"
 
 namespace {
@@ -475,7 +475,7 @@ void CFWL_Form::OnProcessMessage(CFWL_Message* pMessage) {
 
   switch (pMessage->GetType()) {
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMsg);
@@ -508,7 +508,7 @@ void CFWL_Form::OnDrawWidget(CFX_Graphics* pGraphics,
   DrawWidget(pGraphics, pMatrix);
 }
 
-void CFWL_Form::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   SetGrab(true);
   m_bLButtonDown = true;
 
@@ -522,7 +522,7 @@ void CFWL_Form::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   Repaint(&pPressBtn->m_rtBtn);
 }
 
-void CFWL_Form::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   SetGrab(false);
   m_bLButtonDown = false;
   CFWL_SysBtn* pPointBtn = GetSysBtnAtPoint(pMsg->m_fx, pMsg->m_fy);
@@ -547,7 +547,7 @@ void CFWL_Form::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void CFWL_Form::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnMouseMove(CFWL_MessageMouse* pMsg) {
   if (m_bLButtonDown)
     return;
 
@@ -601,7 +601,7 @@ void CFWL_Form::OnMouseMove(CFWL_MsgMouse* pMsg) {
     Repaint(&rtInvalidate);
 }
 
-void CFWL_Form::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnMouseLeave(CFWL_MessageMouse* pMsg) {
   CFWL_SysBtn* pHover = GetSysBtnByState(FWL_SYSBUTTONSTATE_Hover);
   if (!pHover)
     return;
@@ -610,7 +610,7 @@ void CFWL_Form::OnMouseLeave(CFWL_MsgMouse* pMsg) {
   Repaint(&pHover->m_rtBtn);
 }
 
-void CFWL_Form::OnLButtonDblClk(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnLButtonDblClk(CFWL_MessageMouse* pMsg) {
   if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_FRM_Resize) &&
       HitTest(pMsg->m_fx, pMsg->m_fy) == FWL_WidgetHit::Titlebar) {
     if (m_bMaximized)