Merge delegates into IFWL_* classes.

xfa/fwl/core/fwl_noteimp.cpp

Index: xfa/fwl/core/fwl_noteimp.cpp
diff --git a/xfa/fwl/core/fwl_noteimp.cpp b/xfa/fwl/core/fwl_noteimp.cpp
index 2ca34f9619915dbfa8a7386e914372dd98e64554..2c67f6e34acc1233ced2d18fdb89aa4fc7c1e182 100644
--- a/xfa/fwl/core/fwl_noteimp.cpp
+++ b/xfa/fwl/core/fwl_noteimp.cpp
@@ -144,7 +144,7 @@ FX_BOOL CFWL_NoteDriver::SetFocus(IFWL_Widget* pFocus, FX_BOOL bNotify) {
     if (bNotify) {
       ms.m_dwExtend = 1;
     }
-    if (IFWL_WidgetDelegate* pDelegate = pPrev->GetCurrentDelegate())
+    if (IFWL_WidgetDelegate* pDelegate = pPrev->GetDelegate())
       pDelegate->OnProcessMessage(&ms);
   }
   if (pFocus) {
@@ -160,7 +160,7 @@ FX_BOOL CFWL_NoteDriver::SetFocus(IFWL_Widget* pFocus, FX_BOOL bNotify) {
       ms.m_dwExtend = 1;
     }
 
-    if (IFWL_WidgetDelegate* pDelegate = pFocus->GetCurrentDelegate())
+    if (IFWL_WidgetDelegate* pDelegate = pFocus->GetDelegate())
       pDelegate->OnProcessMessage(&ms);
   }
   return TRUE;
@@ -361,7 +361,7 @@ FX_BOOL CFWL_NoteDriver::DispatchMessage(CFWL_Message* pMessage,
   }
   if (bRet) {
     if (IFWL_WidgetDelegate* pDelegate =
-            pMessage->m_pDstTarget->GetCurrentDelegate()) {
+            pMessage->m_pDstTarget->GetDelegate()) {
       pDelegate->OnProcessMessage(pMessage);
     }
   }
@@ -707,7 +707,7 @@ int32_t CFWL_EventTarget::SetEventSource(IFWL_Widget* pSource,
 }
 
 FX_BOOL CFWL_EventTarget::ProcessEvent(CFWL_Event* pEvent) {
-  IFWL_WidgetDelegate* pDelegate = m_pListener->GetCurrentDelegate();
+  IFWL_WidgetDelegate* pDelegate = m_pListener->GetDelegate();
   if (!pDelegate)
     return FALSE;
   if (m_eventSources.GetCount() == 0) {