diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-08 15:12:10 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-08 20:34:05 +0000 |
| commit | 94fc2af0c9a800f39e4dbcac859f1ad490f7d725 (patch) | |
| tree | 3543b5cd38104b00027adde5a8bfe1f5152360c1 /fxjs/xfa/cjx_field.cpp | |
| parent | 625de446907e8720f0114422683b78a898dd6878 (diff) | |
| download | pdfium-94fc2af0c9a800f39e4dbcac859f1ad490f7d725.tar.xz | |
Move CXFA_WidgetAcc from CJX_Object to CXFA_Object
This CL change the CJX code to not store the pointer to the
CXFA_WidgetAcc. If needed the CJX object gets the Acc from the Node
itself.
Change-Id: I5a5a500b8fbc1749d362346d72678acd5250d112
Reviewed-on: https://pdfium-review.googlesource.com/22411
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fxjs/xfa/cjx_field.cpp')
| -rw-r--r-- | fxjs/xfa/cjx_field.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fxjs/xfa/cjx_field.cpp b/fxjs/xfa/cjx_field.cpp index e62fa3a33a..b04d8de26a 100644 --- a/fxjs/xfa/cjx_field.cpp +++ b/fxjs/xfa/cjx_field.cpp @@ -41,7 +41,7 @@ CJX_Field::~CJX_Field() {} CJS_Return CJX_Field::clearItems( CJS_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { - CXFA_WidgetAcc* pWidgetAcc = GetWidgetAcc(); + CXFA_WidgetAcc* pWidgetAcc = ToNode(GetXFAObject())->GetWidgetAcc(); if (pWidgetAcc) pWidgetAcc->DeleteItem(-1, true, false); return CJS_Return(true); @@ -82,7 +82,7 @@ CJS_Return CJX_Field::deleteItem( if (params.size() != 1) return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - CXFA_WidgetAcc* pWidgetAcc = GetWidgetAcc(); + CXFA_WidgetAcc* pWidgetAcc = ToNode(GetXFAObject())->GetWidgetAcc(); if (!pWidgetAcc) return CJS_Return(true); @@ -100,7 +100,7 @@ CJS_Return CJX_Field::getSaveItem( if (iIndex < 0) return CJS_Return(runtime->NewNull()); - CXFA_WidgetAcc* pWidgetAcc = GetWidgetAcc(); + CXFA_WidgetAcc* pWidgetAcc = ToNode(GetXFAObject())->GetWidgetAcc(); if (!pWidgetAcc) return CJS_Return(runtime->NewNull()); @@ -117,7 +117,7 @@ CJS_Return CJX_Field::boundItem( if (params.size() != 1) return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - CXFA_WidgetAcc* pWidgetAcc = GetWidgetAcc(); + CXFA_WidgetAcc* pWidgetAcc = ToNode(GetXFAObject())->GetWidgetAcc(); if (!pWidgetAcc) return CJS_Return(true); @@ -132,7 +132,7 @@ CJS_Return CJX_Field::getItemState( if (params.size() != 1) return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - CXFA_WidgetAcc* pWidgetAcc = GetWidgetAcc(); + CXFA_WidgetAcc* pWidgetAcc = ToNode(GetXFAObject())->GetWidgetAcc(); if (!pWidgetAcc) return CJS_Return(true); @@ -164,7 +164,7 @@ CJS_Return CJX_Field::getDisplayItem( if (iIndex < 0) return CJS_Return(runtime->NewNull()); - CXFA_WidgetAcc* pWidgetAcc = GetWidgetAcc(); + CXFA_WidgetAcc* pWidgetAcc = ToNode(GetXFAObject())->GetWidgetAcc(); if (!pWidgetAcc) return CJS_Return(runtime->NewNull()); @@ -181,7 +181,7 @@ CJS_Return CJX_Field::setItemState( if (params.size() != 2) return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - CXFA_WidgetAcc* pWidgetAcc = GetWidgetAcc(); + CXFA_WidgetAcc* pWidgetAcc = ToNode(GetXFAObject())->GetWidgetAcc(); if (!pWidgetAcc) return CJS_Return(true); @@ -201,7 +201,7 @@ CJS_Return CJX_Field::addItem(CJS_V8* runtime, if (params.size() != 1 && params.size() != 2) return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - CXFA_WidgetAcc* pWidgetAcc = GetWidgetAcc(); + CXFA_WidgetAcc* pWidgetAcc = ToNode(GetXFAObject())->GetWidgetAcc(); if (!pWidgetAcc) return CJS_Return(true); |