From eda1761e6a90058a97cee1bcd763a2447eb6a67b Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 2 Nov 2017 19:40:58 +0000 Subject: Remove default values from Set{UserData|Object} and GetUserData. This CL removes the default values and inlines at the call sites. Change-Id: I47ff04a01c30af89949e9c8dd5d51f7ffaef1f98 Reviewed-on: https://pdfium-review.googlesource.com/17610 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- fxjs/cjx_node.cpp | 2 +- fxjs/cjx_node.h | 6 +++--- xfa/fxfa/cxfa_ffdocview.cpp | 12 ++++++------ xfa/fxfa/cxfa_widgetacc.cpp | 2 +- xfa/fxfa/parser/cxfa_contentlayoutitem.cpp | 4 ++-- xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp | 12 ++++++------ xfa/fxfa/parser/cxfa_layoutpagemgr.cpp | 23 ++++++++++++----------- xfa/fxfa/parser/cxfa_layoutprocessor.cpp | 2 +- xfa/fxfa/parser/cxfa_node.cpp | 12 ++++++------ xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | 4 ++-- 10 files changed, 40 insertions(+), 39 deletions(-) diff --git a/fxjs/cjx_node.cpp b/fxjs/cjx_node.cpp index b4f480e537..b4d99dd38e 100644 --- a/fxjs/cjx_node.cpp +++ b/fxjs/cjx_node.cpp @@ -3236,7 +3236,7 @@ void* CJX_Node::GetObject(XFA_ATTRIBUTE eAttr) { bool CJX_Node::TryObject(XFA_ATTRIBUTE eAttr, void*& pData) { void* pKey = GetMapKey_Element(GetXFANode()->GetElementType(), eAttr); - pData = GetUserData(pKey); + pData = GetUserData(pKey, false); return !!pData; } diff --git a/fxjs/cjx_node.h b/fxjs/cjx_node.h index a492a32f39..1434029def 100644 --- a/fxjs/cjx_node.h +++ b/fxjs/cjx_node.h @@ -112,13 +112,13 @@ class CJX_Node : public CJX_Object { bool SetUserData(void* pKey, void* pData, - XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = nullptr); - void* GetUserData(void* pKey, bool bProtoAlso = false); + XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo); + void* GetUserData(void* pKey, bool bProtoAlso); bool TryObject(XFA_ATTRIBUTE eAttr, void*& pData); bool SetObject(XFA_ATTRIBUTE eAttr, void* pData, - XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = nullptr); + XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo); void* GetObject(XFA_ATTRIBUTE eAttr); bool TryNamespace(WideString& wsNamespace); diff --git a/xfa/fxfa/cxfa_ffdocview.cpp b/xfa/fxfa/cxfa_ffdocview.cpp index a23c7e2958..7d48a309ee 100644 --- a/xfa/fxfa/cxfa_ffdocview.cpp +++ b/xfa/fxfa/cxfa_ffdocview.cpp @@ -619,7 +619,7 @@ void CXFA_FFDocView::AddCalculateWidgetAcc(CXFA_WidgetAcc* pWidgetAcc) { void CXFA_FFDocView::AddCalculateNodeNotify(CXFA_Node* pNodeChange) { auto* pGlobalData = static_cast( - pNodeChange->JSNode()->GetUserData(XFA_CalcData)); + pNodeChange->JSNode()->GetUserData(XFA_CalcData, false)); if (!pGlobalData) return; @@ -635,10 +635,10 @@ size_t CXFA_FFDocView::RunCalculateRecursive(size_t index) { AddCalculateNodeNotify(pCurAcc->GetNode()); int32_t iRefCount = (int32_t)(uintptr_t)pCurAcc->GetNode()->JSNode()->GetUserData( - XFA_CalcRefCount); + XFA_CalcRefCount, false); iRefCount++; - pCurAcc->GetNode()->JSNode()->SetUserData(XFA_CalcRefCount, - (void*)(uintptr_t)iRefCount); + pCurAcc->GetNode()->JSNode()->SetUserData( + XFA_CalcRefCount, (void*)(uintptr_t)iRefCount, nullptr); if (iRefCount > 11) break; if (pCurAcc->ProcessCalculate() == XFA_EVENTERROR_Success) @@ -656,8 +656,8 @@ int32_t CXFA_FFDocView::RunCalculateWidgets() { RunCalculateRecursive(0); for (CXFA_WidgetAcc* pCurAcc : m_CalculateAccs) - pCurAcc->GetNode()->JSNode()->SetUserData(XFA_CalcRefCount, - (void*)(uintptr_t)0); + pCurAcc->GetNode()->JSNode()->SetUserData(XFA_CalcRefCount, nullptr, + nullptr); m_CalculateAccs.clear(); return XFA_EVENTERROR_Success; diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp index ffc645bd03..a75fa2a2b4 100644 --- a/xfa/fxfa/cxfa_widgetacc.cpp +++ b/xfa/fxfa/cxfa_widgetacc.cpp @@ -661,7 +661,7 @@ int32_t CXFA_WidgetAcc::ExecuteScript(CXFA_Script script, continue; auto* pGlobalData = static_cast( - pRefNode->JSNode()->GetUserData(XFA_CalcData)); + pRefNode->JSNode()->GetUserData(XFA_CalcData, false)); if (!pGlobalData) { pGlobalData = new CXFA_CalcData; pRefNode->JSNode()->SetUserData(XFA_CalcData, pGlobalData, diff --git a/xfa/fxfa/parser/cxfa_contentlayoutitem.cpp b/xfa/fxfa/parser/cxfa_contentlayoutitem.cpp index 03c3ebcc84..28871259ce 100644 --- a/xfa/fxfa/parser/cxfa_contentlayoutitem.cpp +++ b/xfa/fxfa/parser/cxfa_contentlayoutitem.cpp @@ -15,6 +15,6 @@ CXFA_ContentLayoutItem::CXFA_ContentLayoutItem(CXFA_Node* pNode) m_dwStatus(0) {} CXFA_ContentLayoutItem::~CXFA_ContentLayoutItem() { - if (m_pFormNode->JSNode()->GetUserData(XFA_LAYOUTITEMKEY) == this) - m_pFormNode->JSNode()->SetUserData(XFA_LAYOUTITEMKEY, nullptr); + if (m_pFormNode->JSNode()->GetUserData(XFA_LAYOUTITEMKEY, false) == this) + m_pFormNode->JSNode()->SetUserData(XFA_LAYOUTITEMKEY, nullptr, nullptr); } diff --git a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp index 428746d3c2..78ac13d816 100644 --- a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp +++ b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp @@ -597,8 +597,8 @@ void DeleteLayoutGeneratedNode(CXFA_Node* pGenerateNode) { for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode; pNode = sIterator.MoveToNext()) { CXFA_ContentLayoutItem* pCurLayoutItem = - (CXFA_ContentLayoutItem*)pNode->JSNode()->GetUserData( - XFA_LAYOUTITEMKEY); + (CXFA_ContentLayoutItem*)pNode->JSNode()->GetUserData(XFA_LAYOUTITEMKEY, + false); CXFA_ContentLayoutItem* pNextLayoutItem = nullptr; while (pCurLayoutItem) { pNextLayoutItem = pCurLayoutItem->m_pNext; @@ -1142,7 +1142,7 @@ CXFA_ItemLayoutProcessor::CXFA_ItemLayoutProcessor(CXFA_Node* pNode, m_pFormNode->GetElementType() == XFA_Element::Form)); m_pOldLayoutItem = (CXFA_ContentLayoutItem*)m_pFormNode->JSNode()->GetUserData( - XFA_LAYOUTITEMKEY); + XFA_LAYOUTITEMKEY, false); } CXFA_ItemLayoutProcessor::~CXFA_ItemLayoutProcessor() {} @@ -1163,7 +1163,7 @@ CXFA_ContentLayoutItem* CXFA_ItemLayoutProcessor::CreateContentLayoutItem( ->OnCreateLayoutItem(pFormNode); CXFA_ContentLayoutItem* pPrevLayoutItem = (CXFA_ContentLayoutItem*)pFormNode->JSNode()->GetUserData( - XFA_LAYOUTITEMKEY); + XFA_LAYOUTITEMKEY, false); if (pPrevLayoutItem) { while (pPrevLayoutItem->m_pNext) pPrevLayoutItem = pPrevLayoutItem->m_pNext; @@ -1171,7 +1171,7 @@ CXFA_ContentLayoutItem* CXFA_ItemLayoutProcessor::CreateContentLayoutItem( pPrevLayoutItem->m_pNext = pLayoutItem; pLayoutItem->m_pPrev = pPrevLayoutItem; } else { - pFormNode->JSNode()->SetUserData(XFA_LAYOUTITEMKEY, pLayoutItem); + pFormNode->JSNode()->SetUserData(XFA_LAYOUTITEMKEY, pLayoutItem, nullptr); } return pLayoutItem; } @@ -2090,7 +2090,7 @@ void CXFA_ItemLayoutProcessor::ProcessUnUseBinds(CXFA_Node* pFormNode) { CXFA_Node* pBindNode = pNode->GetBindData(); if (pBindNode) { pBindNode->RemoveBindItem(pNode); - pNode->JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr); + pNode->JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr, nullptr); } } pNode->SetFlag(XFA_NodeFlag_UnusedNode, true); diff --git a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp index 568b7ebb19..ce9dbf7de0 100644 --- a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp +++ b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp @@ -286,7 +286,7 @@ bool CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) { } m_pPageSetCurRoot = m_pPageSetLayoutItemRoot; m_pTemplatePageSetRoot->JSNode()->SetUserData( - XFA_LAYOUTITEMKEY, (void*)m_pPageSetLayoutItemRoot); + XFA_LAYOUTITEMKEY, (void*)m_pPageSetLayoutItemRoot, nullptr); XFA_ATTRIBUTEENUM eRelation = m_pTemplatePageSetRoot->JSNode()->GetEnum(XFA_ATTRIBUTE_Relation); if (eRelation != XFA_ATTRIBUTEENUM_Unknown) @@ -505,7 +505,7 @@ CXFA_ContainerRecord* CXFA_LayoutPageMgr::CreateContainerRecord( } else { CXFA_ContainerLayoutItem* pParentLayoutItem = static_cast( - pPageSet->JSNode()->GetUserData(XFA_LAYOUTITEMKEY)); + pPageSet->JSNode()->GetUserData(XFA_LAYOUTITEMKEY, false)); if (!pParentLayoutItem) pParentLayoutItem = m_pPageSetCurRoot; @@ -520,12 +520,12 @@ CXFA_ContainerRecord* CXFA_LayoutPageMgr::CreateContainerRecord( pParentPageSetLayout = static_cast( pPageSet->GetNodeItem(XFA_NODEITEM_Parent) ->JSNode() - ->GetUserData(XFA_LAYOUTITEMKEY)); + ->GetUserData(XFA_LAYOUTITEMKEY, false)); } CXFA_ContainerLayoutItem* pPageSetLayoutItem = new CXFA_ContainerLayoutItem(pPageSet); pPageSet->JSNode()->SetUserData(XFA_LAYOUTITEMKEY, - (void*)pPageSetLayoutItem); + (void*)pPageSetLayoutItem, nullptr); if (!pParentPageSetLayout) { CXFA_ContainerLayoutItem* pPrePageSet = m_pPageSetLayoutItemRoot; while (pPrePageSet->m_pNextSibling) { @@ -549,7 +549,7 @@ CXFA_ContainerRecord* CXFA_LayoutPageMgr::CreateContainerRecord( CXFA_ContainerLayoutItem* pPageSetLayoutItem = new CXFA_ContainerLayoutItem(pPageSet); pPageSet->JSNode()->SetUserData(XFA_LAYOUTITEMKEY, - (void*)pPageSetLayoutItem); + (void*)pPageSetLayoutItem, nullptr); m_pPageSetLayoutItemRoot->AddChild(pPageSetLayoutItem); pNewRecord->pCurPageSet = pPageSetLayoutItem; } @@ -1698,7 +1698,8 @@ void CXFA_LayoutPageMgr::MergePageSetContents() { CXFA_Node* pBindNode = pNode->GetBindData(); if (pBindNode) { pBindNode->RemoveBindItem(pNode); - pNode->JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr); + pNode->JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr, + nullptr); } } pNode->SetFlag(XFA_NodeFlag_UnusedNode, true); @@ -1731,9 +1732,9 @@ void CXFA_LayoutPageMgr::MergePageSetContents() { } } if (pRootPageSetContainerItem->m_pFormNode->JSNode()->GetUserData( - XFA_LAYOUTITEMKEY) == pRootPageSetContainerItem) { + XFA_LAYOUTITEMKEY, false) == pRootPageSetContainerItem) { pRootPageSetContainerItem->m_pFormNode->JSNode()->SetUserData( - XFA_LAYOUTITEMKEY, nullptr); + XFA_LAYOUTITEMKEY, nullptr, nullptr); } pRootPageSetContainerItem->m_pFormNode = pPendingPageSet; pPendingPageSet->ClearFlag(XFA_NodeFlag_UnusedNode); @@ -1781,7 +1782,7 @@ void CXFA_LayoutPageMgr::MergePageSetContents() { pIter = sIterator.MoveToNext()) { if (pIter->GetElementType() != XFA_Element::ContentArea) { CXFA_LayoutItem* pLayoutItem = static_cast( - pIter->JSNode()->GetUserData(XFA_LAYOUTITEMKEY)); + pIter->JSNode()->GetUserData(XFA_LAYOUTITEMKEY, false)); if (pLayoutItem) { pNotify->OnLayoutItemRemoving(pDocLayout, pLayoutItem); delete pLayoutItem; @@ -1845,7 +1846,7 @@ void CXFA_LayoutPageMgr::MergePageSetContents() { CXFA_Node* pChildNode = iteChild.MoveToNext(); for (; pChildNode; pChildNode = iteChild.MoveToNext()) { CXFA_LayoutItem* pLayoutItem = static_cast( - pChildNode->JSNode()->GetUserData(XFA_LAYOUTITEMKEY)); + pChildNode->JSNode()->GetUserData(XFA_LAYOUTITEMKEY, false)); if (pLayoutItem) { pNotify->OnLayoutItemRemoving(pDocLayout, pLayoutItem); delete pLayoutItem; @@ -1853,7 +1854,7 @@ void CXFA_LayoutPageMgr::MergePageSetContents() { } } else if (eType != XFA_Element::ContentArea) { CXFA_LayoutItem* pLayoutItem = static_cast( - pNode->JSNode()->GetUserData(XFA_LAYOUTITEMKEY)); + pNode->JSNode()->GetUserData(XFA_LAYOUTITEMKEY, false)); if (pLayoutItem) { pNotify->OnLayoutItemRemoving(pDocLayout, pLayoutItem); delete pLayoutItem; diff --git a/xfa/fxfa/parser/cxfa_layoutprocessor.cpp b/xfa/fxfa/parser/cxfa_layoutprocessor.cpp index 53a28f394a..17248c881a 100644 --- a/xfa/fxfa/parser/cxfa_layoutprocessor.cpp +++ b/xfa/fxfa/parser/cxfa_layoutprocessor.cpp @@ -123,7 +123,7 @@ CXFA_ContainerLayoutItem* CXFA_LayoutProcessor::GetPage(int32_t index) const { CXFA_LayoutItem* CXFA_LayoutProcessor::GetLayoutItem(CXFA_Node* pFormItem) { return static_cast( - pFormItem->JSNode()->GetUserData(XFA_LAYOUTITEMKEY)); + pFormItem->JSNode()->GetUserData(XFA_LAYOUTITEMKEY, false)); } void CXFA_LayoutProcessor::AddChangedContainer(CXFA_Node* pContainer) { diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 1d0b639004..b2677573f5 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -211,7 +211,7 @@ CXFA_Node* CXFA_Node::Clone(bool bRecursive) { } } pClone->SetFlag(XFA_NodeFlag_Initialized, true); - pClone->JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr); + pClone->JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr, nullptr); return pClone; } @@ -405,7 +405,7 @@ int32_t CXFA_Node::AddBindItem(CXFA_Node* pFormNode) { CXFA_Node* pOldFormItem = static_cast(JSNode()->GetObject(XFA_ATTRIBUTE_BindingNode)); if (!pOldFormItem) { - JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, pFormNode); + JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, pFormNode, nullptr); return 1; } if (pOldFormItem == pFormNode) @@ -430,8 +430,8 @@ int32_t CXFA_Node::RemoveBindItem(CXFA_Node* pFormNode) { *iter = pItems->back(); pItems->pop_back(); if (pItems->size() == 1) { - JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, - (*pItems)[0]); // Invalidates pItems. + JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, (*pItems)[0], + nullptr); // Invalidates pItems. m_uNodeFlags &= ~XFA_NodeFlag_BindFormItems; return 1; } @@ -443,7 +443,7 @@ int32_t CXFA_Node::RemoveBindItem(CXFA_Node* pFormNode) { if (pOldFormItem != pFormNode) return pOldFormItem ? 1 : 0; - JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr); + JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr, nullptr); return 0; } @@ -1936,7 +1936,7 @@ void CXFA_Node::RemoveItem(CXFA_Node* pRemoveInstance, pDataParent->RemoveChild(pDataNode); } } - pFormNode->JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr); + pFormNode->JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr, nullptr); } } diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp index c7354a7a63..2ed6c7288a 100644 --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp @@ -122,7 +122,7 @@ bool FormValueNode_SetChildContent(CXFA_Node* pValueNode, void CreateDataBinding(CXFA_Node* pFormNode, CXFA_Node* pDataNode, bool bDataToForm) { - pFormNode->JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, pDataNode); + pFormNode->JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, pDataNode, nullptr); pDataNode->AddBindItem(pFormNode); XFA_Element eType = pFormNode->GetElementType(); if (eType != XFA_Element::Field && eType != XFA_Element::ExclGroup) @@ -1536,7 +1536,7 @@ void CXFA_Document::DoDataRemerge(bool bDoDataMerge) { if (pFormRoot) { while (CXFA_Node* pNode = pFormRoot->GetNodeItem(XFA_NODEITEM_FirstChild)) pFormRoot->RemoveChild(pNode); - pFormRoot->JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr); + pFormRoot->JSNode()->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr, nullptr); } m_rgGlobalBinding.clear(); if (bDoDataMerge) -- cgit v1.2.3