From 4dd1b07b00842f33be3ebccdc8e4fd3219191c63 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 29 Jan 2018 20:49:26 +0000 Subject: Fold single caller methods into callsite This CL folds the GetNodeSameClassIndex, GetNodeSameNameIndex from CXFA_Node into the CJX_Tree callsites. Change-Id: Ia4f7750543e786ddd82abb4b6b4bde1bf1710f19 Reviewed-on: https://pdfium-review.googlesource.com/24471 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- fxjs/xfa/cjx_tree.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'fxjs') diff --git a/fxjs/xfa/cjx_tree.cpp b/fxjs/xfa/cjx_tree.cpp index e20115b9bc..c11d77b125 100644 --- a/fxjs/xfa/cjx_tree.cpp +++ b/fxjs/xfa/cjx_tree.cpp @@ -175,7 +175,13 @@ void CJX_Tree::index(CFXJSE_Value* pValue, ThrowInvalidPropertyException(); return; } - pValue->SetInteger(ToNode(GetXFAObject())->GetNodeSameNameIndex()); + + CFXJSE_Engine* pScriptContext = GetDocument()->GetScriptContext(); + if (!pScriptContext) { + pValue->SetInteger(-1); + return; + } + pValue->SetInteger(pScriptContext->GetIndexByName(ToNode(GetXFAObject()))); } void CJX_Tree::classIndex(CFXJSE_Value* pValue, @@ -185,7 +191,14 @@ void CJX_Tree::classIndex(CFXJSE_Value* pValue, ThrowInvalidPropertyException(); return; } - pValue->SetInteger(ToNode(GetXFAObject())->GetNodeSameClassIndex()); + + CFXJSE_Engine* pScriptContext = GetDocument()->GetScriptContext(); + if (!pScriptContext) { + pValue->SetInteger(-1); + return; + } + pValue->SetInteger( + pScriptContext->GetIndexByClassName(ToNode(GetXFAObject()))); } void CJX_Tree::somExpression(CFXJSE_Value* pValue, -- cgit v1.2.3