diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-20 20:27:43 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-20 20:27:43 +0000 |
| commit | 68c77592f25f9173d2166fa01fb34b4155f4cfcb (patch) | |
| tree | ced2e1308f8b1e6b4c0934dc5f3b1c697223de61 /xfa/fxfa/cxfa_ffnotify.cpp | |
| parent | fae5e26d983848089e35e2b53e9da24036661b08 (diff) | |
| download | pdfium-68c77592f25f9173d2166fa01fb34b4155f4cfcb.tar.xz | |
Remove {Set|Get|Try}Object methods
The CJX_Node::{Set|Get|Try}Object methods are used to set
CXFA_WidgetData and CXFA_Node objects into the CJX_Node. This is stored
in the node as void* data and custom delete methods are passed when
needed.
Instead, this CL just stores the two types of things we need on the
CJX_Node and returns the correct types. This uses a bit more space on
the CJX_Node, but it makes the code a lot clearer and simpler.
Change-Id: I8546ea6456a1c1f5f8b602a6a420a0e85f3fac29
Reviewed-on: https://pdfium-review.googlesource.com/18570
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffnotify.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffnotify.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/xfa/fxfa/cxfa_ffnotify.cpp b/xfa/fxfa/cxfa_ffnotify.cpp index 068cf70591..7e66e4e888 100644 --- a/xfa/fxfa/cxfa_ffnotify.cpp +++ b/xfa/fxfa/cxfa_ffnotify.cpp @@ -6,6 +6,9 @@ #include "xfa/fxfa/cxfa_ffnotify.h" +#include <memory> +#include <utility> + #include "xfa/fxfa/cxfa_ffapp.h" #include "xfa/fxfa/cxfa_ffarc.h" #include "xfa/fxfa/cxfa_ffbarcode.h" @@ -52,13 +55,6 @@ CXFA_FFComboBox* ToComboBox(CXFA_FFWidget* widget) { } // namespace -static void XFA_FFDeleteWidgetAcc(void* pData) { - delete ToWidgetAcc(pData); -} - -static XFA_MAPDATABLOCKCALLBACKINFO gs_XFADeleteWidgetAcc = { - XFA_FFDeleteWidgetAcc, nullptr}; - CXFA_FFNotify::CXFA_FFNotify(CXFA_FFDoc* pDoc) : m_pDoc(pDoc) {} CXFA_FFNotify::~CXFA_FFNotify() {} @@ -345,9 +341,8 @@ void CXFA_FFNotify::OnNodeReady(CXFA_Node* pNode) { XFA_Element eType = pNode->GetElementType(); if (XFA_IsCreateWidget(eType)) { - CXFA_WidgetAcc* pAcc = new CXFA_WidgetAcc(pDocView, pNode); - pNode->JSNode()->SetObject(XFA_Attribute::WidgetData, pAcc, - &gs_XFADeleteWidgetAcc); + pNode->JSNode()->SetWidgetData( + pdfium::MakeUnique<CXFA_WidgetAcc>(pDocView, pNode)); return; } switch (eType) { |