Continue IFWL cleanup

xfa/fwl/core/ifwl_combolist.cpp

 // Copyright 2016 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/ifwl_combolist.h"
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fwl/core/ifwl_combobox.h"
@@ skipping 85 matching lines @@
   if (!pMessage)
     return;
 
   CFWL_MessageType dwHashCode = pMessage->GetClassID();
   bool backDefault = true;
   if (dwHashCode == CFWL_MessageType::SetFocus ||
       dwHashCode == CFWL_MessageType::KillFocus) {
     OnDropListFocusChanged(pMessage, dwHashCode == CFWL_MessageType::SetFocus);
   } else if (dwHashCode == CFWL_MessageType::Mouse) {
     CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
-    if (IsShowScrollBar(true) && m_pVertScrollBar) {
+    IFWL_ScrollBar* vertSB = GetVertScrollBar();
+    if (IsShowScrollBar(true) && vertSB) {
       CFX_RectF rect;
-      m_pVertScrollBar->GetWidgetRect(rect);
+      vertSB->GetWidgetRect(rect);
       if (rect.Contains(pMsg->m_fx, pMsg->m_fy)) {
         pMsg->m_fx -= rect.left;
         pMsg->m_fy -= rect.top;
-        m_pVertScrollBar->GetDelegate()->OnProcessMessage(pMsg);
+        vertSB->GetDelegate()->OnProcessMessage(pMsg);
         return;
       }
     }
     switch (pMsg->m_dwCmd) {
       case FWL_MouseCommand::Move: {
         backDefault = false;
         OnDropListMouseMove(pMsg);
         break;
       }
       case FWL_MouseCommand::LeftButtonDown: {
@@ skipping 22 matching lines @@
 
   CFWL_MsgKillFocus* pKill = static_cast<CFWL_MsgKillFocus*>(pMsg);
   IFWL_ComboBox* pOuter = static_cast<IFWL_ComboBox*>(m_pOuter);
   if (pKill->m_pSetFocus == m_pOuter ||
       pKill->m_pSetFocus == pOuter->GetComboEdit()) {
     pOuter->ShowDropList(false);
   }
 }
 
 int32_t IFWL_ComboList::OnDropListMouseMove(CFWL_MsgMouse* pMsg) {
-  if (m_rtClient.Contains(pMsg->m_fx, pMsg->m_fy)) {
+  if (GetRTClient().Contains(pMsg->m_fx, pMsg->m_fy)) {
     if (m_bNotifyOwner) {
       m_bNotifyOwner = false;
     }
-    if (IsShowScrollBar(true) && m_pVertScrollBar) {
+    IFWL_ScrollBar* vertSB = GetVertScrollBar();
+    if (IsShowScrollBar(true) && vertSB) {
       CFX_RectF rect;
-      m_pVertScrollBar->GetWidgetRect(rect);
+      vertSB->GetWidgetRect(rect);
       if (rect.Contains(pMsg->m_fx, pMsg->m_fy)) {
         return 1;
       }
     }
     CFWL_ListItem* hItem = GetItemAtPoint(pMsg->m_fx, pMsg->m_fy);
     if (hItem) {
       if (!m_pProperties->m_pDataProvider)
         return 0;
       IFWL_ListBoxDP* pData =
           static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
       int32_t iSel = pData->GetItemIndex(this, hItem);
       CFWL_EvtCmbHoverChanged event;
       event.m_pSrcTarget = m_pOuter;
       event.m_iCurHover = iSel;
       DispatchEvent(&event);
       ChangeSelected(iSel);
     }
   } else if (m_bNotifyOwner) {
     ClientToOuter(pMsg->m_fx, pMsg->m_fy);
     IFWL_ComboBox* pOuter = static_cast<IFWL_ComboBox*>(m_pOuter);
     pOuter->GetDelegate()->OnProcessMessage(pMsg);
   }
   return 1;
 }
 
 int32_t IFWL_ComboList::OnDropListLButtonDown(CFWL_MsgMouse* pMsg) {
-  if (m_rtClient.Contains(pMsg->m_fx, pMsg->m_fy))
+  if (GetRTClient().Contains(pMsg->m_fx, pMsg->m_fy))
     return 0;
 
   IFWL_ComboBox* pOuter = static_cast<IFWL_ComboBox*>(m_pOuter);
   pOuter->ShowDropList(false);
   return 1;
 }
 
 int32_t IFWL_ComboList::OnDropListLButtonUp(CFWL_MsgMouse* pMsg) {
   IFWL_ComboBox* pOuter = static_cast<IFWL_ComboBox*>(m_pOuter);
   if (m_bNotifyOwner) {
     ClientToOuter(pMsg->m_fx, pMsg->m_fy);
     pOuter->GetDelegate()->OnProcessMessage(pMsg);
   } else {
-    if (IsShowScrollBar(true) && m_pVertScrollBar) {
+    IFWL_ScrollBar* vertSB = GetVertScrollBar();
+    if (IsShowScrollBar(true) && vertSB) {
       CFX_RectF rect;
-      m_pVertScrollBar->GetWidgetRect(rect);
+      vertSB->GetWidgetRect(rect);
       if (rect.Contains(pMsg->m_fx, pMsg->m_fy)) {
         return 1;
       }
     }
     pOuter->ShowDropList(false);
     CFWL_ListItem* hItem = GetItemAtPoint(pMsg->m_fx, pMsg->m_fy);
     if (hItem)
       pOuter->ProcessSelChanged(true);
   }
   return 1;
@@ skipping 50 matching lines @@
       CFX_RectF rtInvalidate;
       rtInvalidate.Set(0, 0, m_pProperties->m_rtWidget.width,
                        m_pProperties->m_rtWidget.height);
       Repaint(&rtInvalidate);
       break;
     }
     default:
       break;
   }
 }