diff options
author | Tom Sepez <tsepez@chromium.org> | 2019-01-16 18:01:24 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2019-01-16 18:01:24 +0000 |
commit | f054f62ad178e1f24a7b15b4de0ec5a8c9460b3a (patch) | |
tree | 667133726e8ff36e43f487709be6ea178fe0231b | |
parent | 4bbbb11d8e5cfde2a0ac5efbbc402c9b993da377 (diff) | |
download | pdfium-f054f62ad178e1f24a7b15b4de0ec5a8c9460b3a.tar.gz |
Do not check null returns from CFWL_App::Get{WidgetMgr,NoteDriver}()
They can't return null since the constructor initializes the
underlying members via MakeUnique<>() each time.
Change-Id: I86822b157b9f74ea9ef819719a7f1af9ed98d013
Reviewed-on: https://pdfium-review.googlesource.com/c/48333
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
-rw-r--r-- | xfa/fwl/cfwl_notedriver.cpp | 8 | ||||
-rw-r--r-- | xfa/fwl/cfwl_widget.cpp | 18 | ||||
-rw-r--r-- | xfa/fwl/cfwl_widgetmgr.cpp | 3 |
3 files changed, 2 insertions, 27 deletions
diff --git a/xfa/fwl/cfwl_notedriver.cpp b/xfa/fwl/cfwl_notedriver.cpp index 34ec0fda8..3b180988b 100644 --- a/xfa/fwl/cfwl_notedriver.cpp +++ b/xfa/fwl/cfwl_notedriver.cpp @@ -250,9 +250,6 @@ bool CFWL_NoteDriver::DoMouse(CFWL_Message* pMessage, bool CFWL_NoteDriver::DoWheel(CFWL_Message* pMessage, CFWL_Widget* pMessageForm) { CFWL_WidgetMgr* pWidgetMgr = pMessageForm->GetOwnerApp()->GetWidgetMgr(); - if (!pWidgetMgr) - return false; - CFWL_MessageMouseWheel* pMsg = static_cast<CFWL_MessageMouseWheel*>(pMessage); CFWL_Widget* pDst = pWidgetMgr->GetWidgetAtPoint(pMessageForm, pMsg->m_pos); if (!pDst) @@ -266,8 +263,6 @@ bool CFWL_NoteDriver::DoWheel(CFWL_Message* pMessage, bool CFWL_NoteDriver::DoMouseEx(CFWL_Message* pMessage, CFWL_Widget* pMessageForm) { CFWL_WidgetMgr* pWidgetMgr = pMessageForm->GetOwnerApp()->GetWidgetMgr(); - if (!pWidgetMgr) - return false; CFWL_Widget* pTarget = nullptr; if (m_pGrab) pTarget = m_pGrab.Get(); @@ -319,9 +314,6 @@ CFWL_Widget* CFWL_NoteDriver::GetMessageForm(CFWL_Widget* pDstTarget) { CFWL_Widget* pMessageForm = m_pNoteLoop->GetForm(); if (!pMessageForm && pDstTarget) { CFWL_WidgetMgr* pWidgetMgr = pDstTarget->GetOwnerApp()->GetWidgetMgr(); - if (!pWidgetMgr) - return nullptr; - pMessageForm = pWidgetMgr->GetSystemFormWidget(pDstTarget); } return pMessageForm; diff --git a/xfa/fwl/cfwl_widget.cpp b/xfa/fwl/cfwl_widget.cpp index 4d988bd43..1fb085595 100644 --- a/xfa/fwl/cfwl_widget.cpp +++ b/xfa/fwl/cfwl_widget.cpp @@ -135,8 +135,9 @@ void CFWL_Widget::SetStates(uint32_t dwStates) { return; CFWL_NoteDriver* noteDriver = GetOwnerApp()->GetNoteDriver(); - CFWL_WidgetMgr* widgetMgr = GetOwnerApp()->GetWidgetMgr(); noteDriver->NotifyTargetHide(this); + + CFWL_WidgetMgr* widgetMgr = GetOwnerApp()->GetWidgetMgr(); CFWL_Widget* child = widgetMgr->GetFirstChildWidget(this); while (child) { noteDriver->NotifyTargetHide(child); @@ -297,17 +298,11 @@ void CFWL_Widget::SetGrab(bool bSet) { void CFWL_Widget::RegisterEventTarget(CFWL_Widget* pEventSource) { CFWL_NoteDriver* pNoteDriver = GetOwnerApp()->GetNoteDriver(); - if (!pNoteDriver) - return; - pNoteDriver->RegisterEventTarget(this, pEventSource); } void CFWL_Widget::UnregisterEventTarget() { CFWL_NoteDriver* pNoteDriver = GetOwnerApp()->GetNoteDriver(); - if (!pNoteDriver) - return; - pNoteDriver->UnregisterEventTarget(this); } @@ -317,9 +312,6 @@ void CFWL_Widget::DispatchEvent(CFWL_Event* pEvent) { return; } CFWL_NoteDriver* pNoteDriver = GetOwnerApp()->GetNoteDriver(); - if (!pNoteDriver) - return; - pNoteDriver->SendEvent(pEvent); } @@ -356,9 +348,6 @@ void CFWL_Widget::DrawBorder(CXFA_Graphics* pGraphics, void CFWL_Widget::NotifyDriver() { CFWL_NoteDriver* pDriver = GetOwnerApp()->GetNoteDriver(); - if (!pDriver) - return; - pDriver->NotifyTargetDestroy(this); } @@ -367,9 +356,6 @@ CFX_SizeF CFWL_Widget::GetOffsetFromParent(CFWL_Widget* pParent) { return CFX_SizeF(); CFWL_WidgetMgr* pWidgetMgr = GetOwnerApp()->GetWidgetMgr(); - if (!pWidgetMgr) - return CFX_SizeF(); - CFX_SizeF szRet(m_pProperties->m_rtWidget.left, m_pProperties->m_rtWidget.top); diff --git a/xfa/fwl/cfwl_widgetmgr.cpp b/xfa/fwl/cfwl_widgetmgr.cpp index a5f714555..e1659d249 100644 --- a/xfa/fwl/cfwl_widgetmgr.cpp +++ b/xfa/fwl/cfwl_widgetmgr.cpp @@ -355,9 +355,6 @@ void CFWL_WidgetMgr::OnProcessMessageToForm(CFWL_Message* pMessage) { return; CFWL_NoteDriver* pNoteDriver = pDstWidget->GetOwnerApp()->GetNoteDriver(); - if (!pNoteDriver) - return; - pNoteDriver->ProcessMessage(pMessage->Clone()); #if (_FX_OS_ == _FX_OS_MACOSX_) |