Cleanup FWL default values part II.

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 66 matching lines @@
 CFWL_NoteLoop* CFWL_NoteDriver::PopNoteLoop() {
   int32_t pos = m_noteLoopQueue.GetSize();
   if (pos <= 0)
     return nullptr;
 
   CFWL_NoteLoop* p = m_noteLoopQueue.GetAt(pos - 1);
   m_noteLoopQueue.RemoveAt(pos - 1);
   return p;
 }
 
-bool CFWL_NoteDriver::SetFocus(CFWL_Widget* pFocus, bool bNotify) {
+bool CFWL_NoteDriver::SetFocus(CFWL_Widget* pFocus) {
   if (m_pFocus == pFocus)
     return true;
 
   CFWL_Widget* pPrev = m_pFocus;
   m_pFocus = pFocus;
   if (pPrev) {
-    CFWL_MsgKillFocus ms(pPrev, pPrev);
-    if (bNotify)
-      ms.m_dwExtend = 1;
-
-    if (IFWL_WidgetDelegate* pDelegate = pPrev->GetDelegate())
+    if (IFWL_WidgetDelegate* pDelegate = pPrev->GetDelegate()) {
+      CFWL_MsgKillFocus ms(pPrev, pPrev);
       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(nullptr, pFocus);
-    if (bNotify)
-      ms.m_dwExtend = 1;
-    if (IFWL_WidgetDelegate* pDelegate = pFocus->GetDelegate())
+    if (IFWL_WidgetDelegate* pDelegate = pFocus->GetDelegate()) {
+      CFWL_MsgSetFocus ms(nullptr, pFocus);
       pDelegate->OnProcessMessage(&ms);
+    }
   }
   return true;
 }
 
 void CFWL_NoteDriver::Run() {
 #if (_FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_WIN32_DESKTOP_ || \
      _FX_OS_ == _FX_WIN64_)
   for (;;) {
     CFWL_NoteLoop* pTopLoop = GetTopLoop();
     if (!pTopLoop || !pTopLoop->ContinueModal())
@@ skipping 351 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);
     }
   }
 }