diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-04-28 10:51:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-28 10:51:13 -0700 |
| commit | 7322343b9322b93d97077575f95a00dcca3f0451 (patch) | |
| tree | 36337e0a2aff2147a9067477f982496129f0f7a1 /xfa/fwl/core/fwl_widgetmgrimp.cpp | |
| parent | e6ebf7af7ea94d48091be300cec84b499d3b8ae0 (diff) | |
| download | pdfium-7322343b9322b93d97077575f95a00dcca3f0451.tar.xz | |
More FWL interface cleanup.
This CL merges the IFWL_Target class into IFWL_Widget and IFWL_Thread into
IFWL_App. The IFWL_WidgetMgrDelegate, IFWL_NoteDriver and IFWL_NotThread are
removed in favour of their concrete classes.
Review-Url: https://codereview.chromium.org/1921853006
Diffstat (limited to 'xfa/fwl/core/fwl_widgetmgrimp.cpp')
| -rw-r--r-- | xfa/fwl/core/fwl_widgetmgrimp.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/xfa/fwl/core/fwl_widgetmgrimp.cpp b/xfa/fwl/core/fwl_widgetmgrimp.cpp index 0bd1acffc7..b1e0ca822a 100644 --- a/xfa/fwl/core/fwl_widgetmgrimp.cpp +++ b/xfa/fwl/core/fwl_widgetmgrimp.cpp @@ -9,8 +9,6 @@ #include "xfa/fwl/core/cfwl_message.h" #include "xfa/fwl/core/fwl_appimp.h" #include "xfa/fwl/core/fwl_noteimp.h" -#include "xfa/fwl/core/fwl_targetimp.h" -#include "xfa/fwl/core/fwl_threadimp.h" #include "xfa/fwl/core/fwl_widgetimp.h" #include "xfa/fwl/core/ifwl_adapternative.h" #include "xfa/fwl/core/ifwl_adapterwidgetmgr.h" @@ -695,22 +693,24 @@ int32_t CFWL_WidgetMgrDelegate::OnProcessMessageToForm(CFWL_Message* pMessage) { return 0; if (!pMessage->m_pDstTarget) return 0; + IFWL_Widget* pDstWidget = pMessage->m_pDstTarget; - IFWL_Thread* pThread = pDstWidget->GetOwnerThread(); - if (!pThread) + IFWL_App* pApp = pDstWidget->GetOwnerApp(); + if (!pApp) return 0; + CFWL_NoteDriver* pNoteDriver = - static_cast<CFWL_NoteDriver*>(pThread->GetNoteDriver()); + static_cast<CFWL_NoteDriver*>(pApp->GetNoteDriver()); if (!pNoteDriver) return 0; - if (m_pWidgetMgr->IsThreadEnabled()) { + + if (m_pWidgetMgr->IsThreadEnabled()) pMessage = static_cast<CFWL_Message*>(pMessage->Clone()); - } - if (m_pWidgetMgr->IsFormDisabled()) { + if (m_pWidgetMgr->IsFormDisabled()) pNoteDriver->ProcessMessage(pMessage); - } else { + else pNoteDriver->QueueMessage(pMessage); - } + #if (_FX_OS_ == _FX_MACOSX_) CFWL_NoteLoop* pTopLoop = pNoteDriver->GetTopLoop(); if (pTopLoop) { |