From 1a3e186e975aa8eb6a6e42f2626b6f8ca980db19 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 21 Aug 2018 22:56:37 +0000 Subject: Use UnownedPtr<> in xfa_resolvenode_rs.h Change-Id: I4420fbf7402a8b08e33ca525e98690643d59efdf Reviewed-on: https://pdfium-review.googlesource.com/40930 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- fxjs/cfxjse_engine.cpp | 23 ++++++++++++----------- fxjs/cfxjse_formcalc_context.cpp | 9 +++++---- fxjs/cfxjse_resolveprocessor.cpp | 1 + fxjs/xfa/cjx_node.cpp | 1 + fxjs/xfa/cjx_tree.cpp | 8 ++++---- 5 files changed, 23 insertions(+), 19 deletions(-) (limited to 'fxjs') diff --git a/fxjs/cfxjse_engine.cpp b/fxjs/cfxjse_engine.cpp index 5d2ee25d43..3b60989f32 100644 --- a/fxjs/cfxjse_engine.cpp +++ b/fxjs/cfxjse_engine.cpp @@ -163,11 +163,12 @@ bool CFXJSE_Engine::QueryNodeByFlag(CXFA_Node* refNode, if (!ResolveObjects(refNode, propname, &resolveRs, dwFlag, nullptr)) return false; if (resolveRs.dwFlags == XFA_ResolveNode_RSType_Nodes) { - pValue->Assign(GetJSValueFromMap(resolveRs.objects.front())); + pValue->Assign(GetJSValueFromMap(resolveRs.objects.front().Get())); return true; } if (resolveRs.dwFlags == XFA_ResolveNode_RSType_Attribute) { - const XFA_SCRIPTATTRIBUTEINFO* lpAttributeInfo = resolveRs.pScriptAttribute; + const XFA_SCRIPTATTRIBUTEINFO* lpAttributeInfo = + resolveRs.pScriptAttribute.Get(); if (lpAttributeInfo) { CJX_Object* jsObject = resolveRs.objects.front()->JSObject(); (jsObject->*(lpAttributeInfo->callback))(pValue, bSetting, @@ -600,8 +601,8 @@ bool CFXJSE_Engine::ResolveObjects(CXFA_Object* refObject, int32_t nStart = 0; int32_t nLevel = 0; - std::vector findObjects; - findObjects.push_back(refObject ? refObject : m_pDocument->GetRoot()); + std::vector> findObjects; + findObjects.emplace_back(refObject ? refObject : m_pDocument->GetRoot()); int32_t nNodes = 0; while (true) { nNodes = pdfium::CollectionSize(findObjects); @@ -617,18 +618,18 @@ bool CFXJSE_Engine::ResolveObjects(CXFA_Object* refObject, pDataNode = m_pDocument->GetNotBindNode(findObjects); if (pDataNode) { findObjects.clear(); - findObjects.push_back(pDataNode); + findObjects.emplace_back(pDataNode); break; } } else { pDataNode = findObjects.front()->AsNode(); findObjects.clear(); - findObjects.push_back(pDataNode); + findObjects.emplace_back(pDataNode); break; } dwStyles |= XFA_RESOLVENODE_Bind; findObjects.clear(); - findObjects.push_back( + findObjects.emplace_back( m_ResolveProcessor->GetNodeHelper()->m_pAllStartParent.Get()); continue; } @@ -658,7 +659,7 @@ bool CFXJSE_Engine::ResolveObjects(CXFA_Object* refObject, m_ResolveProcessor->SetIndexDataBind(rndBind.m_wsCondition, i, nNodes); bDataBind = true; } - rndFind.m_CurObject = findObjects[i++]; + rndFind.m_CurObject = findObjects[i++].Get(); rndFind.m_nLevel = nLevel; rndFind.m_dwFlag = XFA_ResolveNode_RSType_Nodes; if (!m_ResolveProcessor->Resolve(rndFind)) @@ -705,8 +706,8 @@ bool CFXJSE_Engine::ResolveObjects(CXFA_Object* refObject, break; } - findObjects = - std::vector(retObjects.begin(), retObjects.end()); + findObjects = std::vector>(retObjects.begin(), + retObjects.end()); rndFind.m_Objects.clear(); if (nLevel == 0) dwStyles &= ~(XFA_RESOLVENODE_Parent | XFA_RESOLVENODE_Siblings); @@ -729,7 +730,7 @@ bool CFXJSE_Engine::ResolveObjects(CXFA_Object* refObject, XFA_RESOLVENODE_BindNew)) { CXFA_NodeHelper* helper = m_ResolveProcessor->GetNodeHelper(); if (helper->m_pCreateParent) - resolveNodeRS->objects.push_back(helper->m_pCreateParent.Get()); + resolveNodeRS->objects.emplace_back(helper->m_pCreateParent.Get()); else helper->CreateNode_ForCondition(rndFind.m_wsCondition); diff --git a/fxjs/cfxjse_formcalc_context.cpp b/fxjs/cfxjse_formcalc_context.cpp index 0eee3d4de5..34f5642844 100644 --- a/fxjs/cfxjse_formcalc_context.cpp +++ b/fxjs/cfxjse_formcalc_context.cpp @@ -5904,7 +5904,7 @@ bool CFXJSE_FormCalcContext::GetObjectForName( dwFlags, nullptr); if (iRet && resolveNodeRS.dwFlags == XFA_ResolveNode_RSType_Nodes) { accessorValue->Assign( - pScriptContext->GetJSValueFromMap(resolveNodeRS.objects.front())); + pScriptContext->GetJSValueFromMap(resolveNodeRS.objects.front().Get())); return true; } return false; @@ -5979,9 +5979,10 @@ void CFXJSE_FormCalcContext::ParseResolveResult( if (resolveNodeRS.dwFlags == XFA_ResolveNode_RSType_Nodes) { *bAttribute = false; CFXJSE_Engine* pScriptContext = pContext->GetDocument()->GetScriptContext(); - for (CXFA_Object* pObject : resolveNodeRS.objects) { + for (auto& pObject : resolveNodeRS.objects) { resultValues->push_back(pdfium::MakeUnique(pIsolate)); - resultValues->back()->Assign(pScriptContext->GetJSValueFromMap(pObject)); + resultValues->back()->Assign( + pScriptContext->GetJSValueFromMap(pObject.Get())); } return; } @@ -5989,7 +5990,7 @@ void CFXJSE_FormCalcContext::ParseResolveResult( *bAttribute = true; if (resolveNodeRS.pScriptAttribute && resolveNodeRS.pScriptAttribute->eValueType == XFA_ScriptType::Object) { - for (CXFA_Object* pObject : resolveNodeRS.objects) { + for (auto& pObject : resolveNodeRS.objects) { auto pValue = pdfium::MakeUnique(pIsolate); CJX_Object* jsObject = pObject->JSObject(); (jsObject->*(resolveNodeRS.pScriptAttribute->callback))( diff --git a/fxjs/cfxjse_resolveprocessor.cpp b/fxjs/cfxjse_resolveprocessor.cpp index 0419b79053..917f78cabb 100644 --- a/fxjs/cfxjse_resolveprocessor.cpp +++ b/fxjs/cfxjse_resolveprocessor.cpp @@ -12,6 +12,7 @@ #include "core/fxcrt/fx_extension.h" #include "fxjs/cfxjse_engine.h" +#include "fxjs/cfxjse_value.h" #include "fxjs/xfa/cjx_object.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" diff --git a/fxjs/xfa/cjx_node.cpp b/fxjs/xfa/cjx_node.cpp index fed94094a7..8876628c3b 100644 --- a/fxjs/xfa/cjx_node.cpp +++ b/fxjs/xfa/cjx_node.cpp @@ -13,6 +13,7 @@ #include "core/fxcrt/cfx_memorystream.h" #include "core/fxcrt/fx_codepage.h" #include "fxjs/cfxjse_engine.h" +#include "fxjs/cfxjse_value.h" #include "fxjs/js_resources.h" #include "third_party/base/ptr_util.h" #include "xfa/fxfa/cxfa_eventparam.h" diff --git a/fxjs/xfa/cjx_tree.cpp b/fxjs/xfa/cjx_tree.cpp index 9787b9b885..23f76583ed 100644 --- a/fxjs/xfa/cjx_tree.cpp +++ b/fxjs/xfa/cjx_tree.cpp @@ -55,7 +55,7 @@ CJS_Result CJX_Tree::resolveNode( } if (resolveNodeRS.dwFlags == XFA_ResolveNode_RSType_Nodes) { - CXFA_Object* pObject = resolveNodeRS.objects.front(); + CXFA_Object* pObject = resolveNodeRS.objects.front().Get(); CFXJSE_Value* value = GetDocument()->GetScriptContext()->GetJSValueFromMap(pObject); if (!value) @@ -66,7 +66,7 @@ CJS_Result CJX_Tree::resolveNode( } const XFA_SCRIPTATTRIBUTEINFO* lpAttributeInfo = - resolveNodeRS.pScriptAttribute; + resolveNodeRS.pScriptAttribute.Get(); if (!lpAttributeInfo || lpAttributeInfo->eValueType != XFA_ScriptType::Object) { return CJS_Result::Success(runtime->NewNull()); @@ -231,14 +231,14 @@ void CJX_Tree::ResolveNodeList(CFXJSE_Value* pValue, &resolveNodeRS, dwFlag, nullptr); CXFA_ArrayNodeList* pNodeList = new CXFA_ArrayNodeList(GetDocument()); if (resolveNodeRS.dwFlags == XFA_ResolveNode_RSType_Nodes) { - for (CXFA_Object* pObject : resolveNodeRS.objects) { + for (auto& pObject : resolveNodeRS.objects) { if (pObject->IsNode()) pNodeList->Append(pObject->AsNode()); } } else { if (resolveNodeRS.pScriptAttribute && resolveNodeRS.pScriptAttribute->eValueType == XFA_ScriptType::Object) { - for (CXFA_Object* pObject : resolveNodeRS.objects) { + for (auto& pObject : resolveNodeRS.objects) { auto pValue = pdfium::MakeUnique(pScriptContext->GetIsolate()); CJX_Object* jsObject = pObject->JSObject(); -- cgit v1.2.3