diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-11-01 08:33:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-01 08:33:02 -0700 |
| commit | 9ec22175f945d227e71c459e7e0b7c464159c18b (patch) | |
| tree | 1c4836aa35a9e8a1da1761562088b1f9df6aa94f /xfa/fwl/core/ifwl_combolist.cpp | |
| parent | 5a22582ca1dbe1d66b18d5253bfa1d202fcc3b4a (diff) | |
| download | pdfium-9ec22175f945d227e71c459e7e0b7c464159c18b.tar.xz | |
Rename IFWL_Widget::SetDelegate
The ::SetDelegate method was misleading. The primary use was
SetDelegate(nullptr) which returned the current delegate and didn't actually
set anything. When a value was passed it would set the
|m_pCurDelegate| not the |m_pDelegate|.
This Cl breaks ::SetDelegate into ::GetCurrentDelegate and ::SetCurrentDelegate
to make it clear what is happening and that this does not effect the
|m_pDelegate| variable.
Review-Url: https://codereview.chromium.org/2459423003
Diffstat (limited to 'xfa/fwl/core/ifwl_combolist.cpp')
| -rw-r--r-- | xfa/fwl/core/ifwl_combolist.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xfa/fwl/core/ifwl_combolist.cpp b/xfa/fwl/core/ifwl_combolist.cpp index 6538bff20d..23392a5c70 100644 --- a/xfa/fwl/core/ifwl_combolist.cpp +++ b/xfa/fwl/core/ifwl_combolist.cpp @@ -124,9 +124,8 @@ void CFWL_ComboListImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { if (rect.Contains(pMsg->m_fx, pMsg->m_fy)) { pMsg->m_fx -= rect.left; pMsg->m_fy -= rect.top; - IFWL_WidgetDelegate* pDelegate = - m_pOwner->m_pVertScrollBar->SetDelegate(nullptr); - pDelegate->OnProcessMessage(pMsg); + m_pOwner->m_pVertScrollBar->GetCurrentDelegate()->OnProcessMessage( + pMsg); return; } } @@ -246,7 +245,6 @@ int32_t CFWL_ComboListImpDelegate::OnDropListKey(CFWL_MsgKey* pKey) { case FWL_VKEY_Up: case FWL_VKEY_Down: { OnDropListKeyDown(pKey); - pOuter->SetDelegate(nullptr); pOuter->ProcessSelChanged(FALSE); return 1; } |