Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_notedriver.cpp

Index: xfa/fwl/cfwl_notedriver.cpp
diff --git a/xfa/fwl/core/cfwl_notedriver.cpp b/xfa/fwl/cfwl_notedriver.cpp
similarity index 92%
rename from xfa/fwl/core/cfwl_notedriver.cpp
rename to xfa/fwl/cfwl_notedriver.cpp
index 8402b2b90c7f95e1963f89ad6db3553524f1c89d..09663f8bcf0c39b761cb376e0efbef6644b53f50 100644
--- a/xfa/fwl/core/cfwl_notedriver.cpp
+++ b/xfa/fwl/cfwl_notedriver.cpp
@@ -4,23 +4,23 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_notedriver.h"
 
 #include <utility>
 
 #include "core/fxcrt/fx_ext.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_eventtarget.h"
-#include "xfa/fwl/core/cfwl_form.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgkillfocus.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_msgmousewheel.h"
-#include "xfa/fwl/core/cfwl_msgsetfocus.h"
-#include "xfa/fwl/core/cfwl_noteloop.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_eventtarget.h"
+#include "xfa/fwl/cfwl_form.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagekillfocus.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_messagemousewheel.h"
+#include "xfa/fwl/cfwl_messagesetfocus.h"
+#include "xfa/fwl/cfwl_noteloop.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
 
 CFWL_NoteDriver::CFWL_NoteDriver()
     : m_pHover(nullptr),
@@ -92,7 +92,7 @@ bool CFWL_NoteDriver::SetFocus(CFWL_Widget* pFocus) {
   m_pFocus = pFocus;
   if (pPrev) {
     if (IFWL_WidgetDelegate* pDelegate = pPrev->GetDelegate()) {
-      CFWL_MsgKillFocus ms(pPrev, pPrev);
+      CFWL_MessageKillFocus ms(pPrev, pPrev);
       pDelegate->OnProcessMessage(&ms);
     }
   }
@@ -104,7 +104,7 @@ bool CFWL_NoteDriver::SetFocus(CFWL_Widget* pFocus) {
       pForm->SetSubFocus(pFocus);
 
     if (IFWL_WidgetDelegate* pDelegate = pFocus->GetDelegate()) {
-      CFWL_MsgSetFocus ms(nullptr, pFocus);
+      CFWL_MessageSetFocus ms(nullptr, pFocus);
       pDelegate->OnProcessMessage(&ms);
     }
   }
@@ -306,7 +306,7 @@ bool CFWL_NoteDriver::DoKillFocus(CFWL_Message* pMessage,
 }
 
 bool CFWL_NoteDriver::DoKey(CFWL_Message* pMessage, CFWL_Widget* pMessageForm) {
-  CFWL_MsgKey* pMsg = static_cast<CFWL_MsgKey*>(pMessage);
+  CFWL_MessageKey* pMsg = static_cast<CFWL_MessageKey*>(pMessage);
 #if (_FX_OS_ != _FX_MACOSX_)
   if (pMsg->m_dwCmd == FWL_KeyCommand::KeyDown &&
       pMsg->m_dwKeyCode == FWL_VKEY_Tab) {
@@ -348,7 +348,7 @@ bool CFWL_NoteDriver::DoKey(CFWL_Message* pMessage, CFWL_Widget* pMessageForm) {
 
 bool CFWL_NoteDriver::DoMouse(CFWL_Message* pMessage,
                               CFWL_Widget* pMessageForm) {
-  CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+  CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
   if (pMsg->m_dwCmd == FWL_MouseCommand::Leave ||
       pMsg->m_dwCmd == FWL_MouseCommand::Hover ||
       pMsg->m_dwCmd == FWL_MouseCommand::Enter) {
@@ -367,7 +367,7 @@ bool CFWL_NoteDriver::DoWheel(CFWL_Message* pMessage,
   if (!pWidgetMgr)
     return false;
 
-  CFWL_MsgMouseWheel* pMsg = static_cast<CFWL_MsgMouseWheel*>(pMessage);
+  CFWL_MessageMouseWheel* pMsg = static_cast<CFWL_MessageMouseWheel*>(pMessage);
   CFWL_Widget* pDst =
       pWidgetMgr->GetWidgetAtPoint(pMessageForm, pMsg->m_fx, pMsg->m_fy);
   if (!pDst)
@@ -387,7 +387,7 @@ bool CFWL_NoteDriver::DoMouseEx(CFWL_Message* pMessage,
   if (m_pGrab)
     pTarget = m_pGrab;
 
-  CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+  CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
   if (!pTarget) {
     pTarget =
         pWidgetMgr->GetWidgetAtPoint(pMessageForm, pMsg->m_fx, pMsg->m_fy);
@@ -408,9 +408,9 @@ void CFWL_NoteDriver::MouseSecondary(CFWL_Message* pMessage) {
   if (pTarget == m_pHover)
     return;
 
-  CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+  CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
   if (m_pHover) {
-    CFWL_MsgMouse msLeave(nullptr, m_pHover);
+    CFWL_MessageMouse msLeave(nullptr, m_pHover);
     msLeave.m_fx = pMsg->m_fx;
     msLeave.m_fy = pMsg->m_fy;
     pTarget->TransformTo(m_pHover, msLeave.m_fx, msLeave.m_fy);
@@ -425,7 +425,7 @@ void CFWL_NoteDriver::MouseSecondary(CFWL_Message* pMessage) {
   }
   m_pHover = pTarget;
 
-  CFWL_MsgMouse msHover(nullptr, pTarget);
+  CFWL_MessageMouse msHover(nullptr, pTarget);
   msHover.m_fx = pMsg->m_fx;
   msHover.m_fy = pMsg->m_fy;
   msHover.m_dwFlags = 0;