summaryrefslogtreecommitdiff
path: root/fxjs/xfa/cjx_object.h
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2018-01-04 11:03:26 -0500
committerChromium commit bot <commit-bot@chromium.org>2018-01-04 16:46:22 +0000
commitd9dfb6cc16f689753e9b3f896fbda1aec791051a (patch)
tree8063ebecea18abc6989cac8b67b0d2fb03a4877a /fxjs/xfa/cjx_object.h
parent8ee5207f4f792295badd21f90727e8c810e7dbdf (diff)
downloadpdfium-d9dfb6cc16f689753e9b3f896fbda1aec791051a.tar.xz
Merge CXFA_WidgetData into CXFA_WidgetAcc
This CL merges the CXFA_WidgetData class into the only subclass, CXFA_WidgetAcc. Code has been updated as needed. Change-Id: I3f5bc83b1422bcbe065276b16bfb91e656f5c174 Reviewed-on: https://pdfium-review.googlesource.com/22252 Reviewed-by: Ryan Harrison <rharrison@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fxjs/xfa/cjx_object.h')
-rw-r--r--fxjs/xfa/cjx_object.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/fxjs/xfa/cjx_object.h b/fxjs/xfa/cjx_object.h
index 32bb01f3f6..d7979a381f 100644
--- a/fxjs/xfa/cjx_object.h
+++ b/fxjs/xfa/cjx_object.h
@@ -17,14 +17,15 @@
#include "core/fxcrt/xml/cfx_xmlelement.h"
#include "fxjs/CJX_Define.h"
#include "third_party/base/optional.h"
+#include "xfa/fxfa/cxfa_widgetacc.h"
#include "xfa/fxfa/fxfa_basic.h"
-#include "xfa/fxfa/parser/cxfa_widgetdata.h"
class CFXJSE_Value;
class CJS_V8;
class CXFA_CalcData;
class CXFA_Document;
class CXFA_LayoutItem;
+class CXFA_Node;
class CXFA_Object;
struct XFA_MAPMODULEDATA;
@@ -63,10 +64,10 @@ class CJX_Object {
CXFA_Document* GetDocument() const;
- void SetWidgetData(std::unique_ptr<CXFA_WidgetData> data) {
+ void SetWidgetAcc(std::unique_ptr<CXFA_WidgetAcc> data) {
widget_data_ = std::move(data);
}
- CXFA_WidgetData* GetWidgetData() const { return widget_data_.get(); }
+ CXFA_WidgetAcc* GetWidgetAcc() const { return widget_data_.get(); }
void SetCalcRecursionCount(size_t count) { calc_recursion_count_ = count; }
size_t GetCalcRecursionCount() const { return calc_recursion_count_; }
@@ -272,7 +273,7 @@ class CJX_Object {
UnownedPtr<CXFA_Object> object_;
UnownedPtr<CXFA_LayoutItem> layout_item_;
- std::unique_ptr<CXFA_WidgetData> widget_data_;
+ std::unique_ptr<CXFA_WidgetAcc> widget_data_;
std::unique_ptr<XFA_MAPMODULEDATA> map_module_data_;
std::unique_ptr<CXFA_CalcData> calc_data_;
std::map<ByteString, CJX_MethodCall> method_specs_;