diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-04 16:53:15 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-04 22:08:21 +0000 |
| commit | 9aeb0caba4cda9c6bd39ed079f88000a712f9890 (patch) | |
| tree | cf5801fa3e5ed9194896771ca66a8a3b80fda709 /xfa/fxfa/cxfa_ffwidgethandler.cpp | |
| parent | 0545d2a5d759dbbb6ac3cce6d82bc0f2188cc4aa (diff) | |
| download | pdfium-9aeb0caba4cda9c6bd39ed079f88000a712f9890.tar.xz | |
Remove CXFA_WidgetData::{GetElementType|GetDatasets}
The GetElementType and GetDatasets methods have been removed from the
CXFA_WidgetData class and we call the CXFA_Node methods directly.
Change-Id: I5178be76c929ac3405eb6a65f9b8775b2f0283e2
Reviewed-on: https://pdfium-review.googlesource.com/22264
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffwidgethandler.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffwidgethandler.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xfa/fxfa/cxfa_ffwidgethandler.cpp b/xfa/fxfa/cxfa_ffwidgethandler.cpp index 4c21c24e2e..8988cf1903 100644 --- a/xfa/fxfa/cxfa_ffwidgethandler.cpp +++ b/xfa/fxfa/cxfa_ffwidgethandler.cpp @@ -188,8 +188,11 @@ bool CXFA_FFWidgetHandler::HasEvent(CXFA_WidgetAcc* pWidgetAcc, if (eEventType == XFA_EVENT_Unknown) return false; - if (!pWidgetAcc || pWidgetAcc->GetElementType() == XFA_Element::Draw) + if (!pWidgetAcc || + (pWidgetAcc->GetNode() && + pWidgetAcc->GetNode()->GetElementType() == XFA_Element::Draw)) { return false; + } switch (eEventType) { case XFA_EVENT_Calculate: { @@ -211,8 +214,11 @@ int32_t CXFA_FFWidgetHandler::ProcessEvent(CXFA_WidgetAcc* pWidgetAcc, CXFA_EventParam* pParam) { if (!pParam || pParam->m_eType == XFA_EVENT_Unknown) return XFA_EVENTERROR_NotExist; - if (!pWidgetAcc || pWidgetAcc->GetElementType() == XFA_Element::Draw) + if (!pWidgetAcc || + (pWidgetAcc->GetNode() && + pWidgetAcc->GetNode()->GetElementType() == XFA_Element::Draw)) { return XFA_EVENTERROR_NotExist; + } switch (pParam->m_eType) { case XFA_EVENT_Calculate: |