diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-06 18:17:41 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-06 18:17:41 +0000 |
| commit | 472bb7f919736ae58461f653597eb6854119cca9 (patch) | |
| tree | fb7a694e41bba43a7be04b3d7790b0872fee68bf /fxjs/cjx_hostpseudomodel.cpp | |
| parent | d19aa7c572c252dd0398f277d13ec1733f1c7098 (diff) | |
| download | pdfium-472bb7f919736ae58461f653597eb6854119cca9.tar.xz | |
Call CJX methods directly instead of proxying
This CL updates the XFA JS code to call the methods on the CJX objects
directly instead of proxying through the CXFA objects. The script
methods have been removed from the CXFA objects.
Change-Id: I2d7b502473a8e88a7af88b10aa0da602d4998394
Reviewed-on: https://pdfium-review.googlesource.com/17851
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fxjs/cjx_hostpseudomodel.cpp')
| -rw-r--r-- | fxjs/cjx_hostpseudomodel.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/fxjs/cjx_hostpseudomodel.cpp b/fxjs/cjx_hostpseudomodel.cpp index b667e7a7f0..5b6fa02591 100644 --- a/fxjs/cjx_hostpseudomodel.cpp +++ b/fxjs/cjx_hostpseudomodel.cpp @@ -283,13 +283,14 @@ void CJX_HostPseudoModel::OpenList(CFXJSE_Arguments* pArguments) { uint32_t dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Parent | XFA_RESOLVENODE_Siblings; - XFA_RESOLVENODE_RS resoveNodeRS; + XFA_RESOLVENODE_RS resolveNodeRS; int32_t iRet = pScriptContext->ResolveObjects( - pObject, pValue->ToWideString().AsStringView(), resoveNodeRS, dwFlag); - if (iRet < 1 || !resoveNodeRS.objects.front()->IsNode()) + pObject, pValue->ToWideString().AsStringView(), resolveNodeRS, + dwFlag); + if (iRet < 1 || !resolveNodeRS.objects.front()->IsNode()) return; - pNode = resoveNodeRS.objects.front()->AsNode(); + pNode = resolveNodeRS.objects.front()->AsNode(); } } @@ -386,13 +387,13 @@ void CJX_HostPseudoModel::ResetData(CFXJSE_Arguments* pArguments) { uint32_t dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Parent | XFA_RESOLVENODE_Siblings; - XFA_RESOLVENODE_RS resoveNodeRS; + XFA_RESOLVENODE_RS resolveNodeRS; int32_t iRet = pScriptContext->ResolveObjects( - pObject, wsName.AsStringView(), resoveNodeRS, dwFlag); - if (iRet < 1 || !resoveNodeRS.objects.front()->IsNode()) + pObject, wsName.AsStringView(), resolveNodeRS, dwFlag); + if (iRet < 1 || !resolveNodeRS.objects.front()->IsNode()) continue; - pNode = resoveNodeRS.objects.front()->AsNode(); + pNode = resolveNodeRS.objects.front()->AsNode(); pNotify->ResetData(pNode->GetWidgetData()); } if (!pNode) @@ -450,13 +451,14 @@ void CJX_HostPseudoModel::SetFocus(CFXJSE_Arguments* pArguments) { uint32_t dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Parent | XFA_RESOLVENODE_Siblings; - XFA_RESOLVENODE_RS resoveNodeRS; + XFA_RESOLVENODE_RS resolveNodeRS; int32_t iRet = pScriptContext->ResolveObjects( - pObject, pValue->ToWideString().AsStringView(), resoveNodeRS, dwFlag); - if (iRet < 1 || !resoveNodeRS.objects.front()->IsNode()) + pObject, pValue->ToWideString().AsStringView(), resolveNodeRS, + dwFlag); + if (iRet < 1 || !resolveNodeRS.objects.front()->IsNode()) return; - pNode = resoveNodeRS.objects.front()->AsNode(); + pNode = resolveNodeRS.objects.front()->AsNode(); } } pNotify->SetFocusWidgetNode(pNode); |