Cleanup FWL Event and Message code.

xfa/fwl/core/cfwl_notedriver.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/core/cfwl_notedriver.h"
 
 #include <utility>
 
@@ skipping 73 matching lines @@
   return p;
 }
 
 bool CFWL_NoteDriver::SetFocus(CFWL_Widget* pFocus, bool bNotify) {
   if (m_pFocus == pFocus)
     return true;
 
   CFWL_Widget* pPrev = m_pFocus;
   m_pFocus = pFocus;
   if (pPrev) {
-    CFWL_MsgKillFocus ms;
-    ms.m_pDstTarget = pPrev;
-    ms.m_pSrcTarget = pPrev;
+    CFWL_MsgKillFocus ms(pPrev, pPrev);
     if (bNotify)
       ms.m_dwExtend = 1;
 
     if (IFWL_WidgetDelegate* pDelegate = pPrev->GetDelegate())
       pDelegate->OnProcessMessage(&ms);
   }
   if (pFocus) {
     CFWL_Widget* pWidget =
         pFocus->GetOwnerApp()->GetWidgetMgr()->GetSystemFormWidget(pFocus);
     CFWL_Form* pForm = static_cast<CFWL_Form*>(pWidget);
     if (pForm)
       pForm->SetSubFocus(pFocus);
 
-    CFWL_MsgSetFocus ms;
-    ms.m_pDstTarget = pFocus;
+    CFWL_MsgSetFocus ms(nullptr, pFocus);
     if (bNotify)
       ms.m_dwExtend = 1;
     if (IFWL_WidgetDelegate* pDelegate = pFocus->GetDelegate())
       pDelegate->OnProcessMessage(&ms);
   }
   return true;
 }
 
 void CFWL_NoteDriver::Run() {
 #if (_FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_WIN32_DESKTOP_ || \
@@ skipping 93 matching lines @@
   CFWL_WidgetMgr* pWidgetMgr =
       pMessage->m_pDstTarget->GetOwnerApp()->GetWidgetMgr();
   CFWL_Widget* pMessageForm = pWidgetMgr->IsFormDisabled()
                                   ? pMessage->m_pDstTarget
                                   : GetMessageForm(pMessage->m_pDstTarget);
   if (!pMessageForm)
     return;
   if (!DispatchMessage(pMessage, pMessageForm))
     return;
 
-  if (pMessage->GetClassID() == CFWL_MessageType::Mouse)
+  if (pMessage->GetType() == CFWL_Message::Type::Mouse)
     MouseSecondary(pMessage);
 }
 
 bool CFWL_NoteDriver::DispatchMessage(CFWL_Message* pMessage,
                                       CFWL_Widget* pMessageForm) {
-  switch (pMessage->GetClassID()) {
-    case CFWL_MessageType::SetFocus: {
+  switch (pMessage->GetType()) {
+    case CFWL_Message::Type::SetFocus: {
       if (!DoSetFocus(pMessage, pMessageForm))
         return false;
       break;
     }
-    case CFWL_MessageType::KillFocus: {
+    case CFWL_Message::Type::KillFocus: {
       if (!DoKillFocus(pMessage, pMessageForm))
         return false;
       break;
     }
-    case CFWL_MessageType::Key: {
+    case CFWL_Message::Type::Key: {
       if (!DoKey(pMessage, pMessageForm))
         return false;
       break;
     }
-    case CFWL_MessageType::Mouse: {
+    case CFWL_Message::Type::Mouse: {
       if (!DoMouse(pMessage, pMessageForm))
         return false;
       break;
     }
-    case CFWL_MessageType::MouseWheel: {
+    case CFWL_Message::Type::MouseWheel: {
       if (!DoWheel(pMessage, pMessageForm))
         return false;
       break;
     }
     default:
       break;
   }
   if (IFWL_WidgetDelegate* pDelegate = pMessage->m_pDstTarget->GetDelegate())
     pDelegate->OnProcessMessage(pMessage);
 
@@ skipping 146 matching lines @@
   return true;
 }
 
 void CFWL_NoteDriver::MouseSecondary(CFWL_Message* pMessage) {
   CFWL_Widget* pTarget = pMessage->m_pDstTarget;
   if (pTarget == m_pHover)
     return;
 
   CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
   if (m_pHover) {
-    CFWL_MsgMouse msLeave;
-    msLeave.m_pDstTarget = m_pHover;
+    CFWL_MsgMouse 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);
 
     msLeave.m_dwFlags = 0;
     msLeave.m_dwCmd = FWL_MouseCommand::Leave;
     DispatchMessage(&msLeave, nullptr);
   }
   if (pTarget->GetClassID() == FWL_Type::Form) {
     m_pHover = nullptr;
     return;
   }
   m_pHover = pTarget;
 
-  CFWL_MsgMouse msHover;
-  msHover.m_pDstTarget = pTarget;
+  CFWL_MsgMouse msHover(nullptr, pTarget);
   msHover.m_fx = pMsg->m_fx;
   msHover.m_fy = pMsg->m_fy;
   msHover.m_dwFlags = 0;
   msHover.m_dwCmd = FWL_MouseCommand::Hover;
   DispatchMessage(&msHover, nullptr);
 }
 
 bool CFWL_NoteDriver::IsValidMessage(CFWL_Message* pMessage) {
   for (int32_t i = 0; i < m_noteLoopQueue.GetSize(); i++) {
     CFWL_NoteLoop* pNoteLoop = m_noteLoopQueue[i];
@@ skipping 32 matching lines @@
 void CFWL_NoteDriver::ClearEventTargets(bool bRemoveAll) {
   auto it = m_eventTargets.begin();
   while (it != m_eventTargets.end()) {
     auto old = it++;
     if (old->second && (bRemoveAll || old->second->IsInvalid())) {
       delete old->second;
       m_eventTargets.erase(old);
     }
   }
 }