diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-02 20:42:18 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-02 20:42:18 +0000 |
commit | 8bafef176a2a810373a386373fa3f558ae427984 (patch) | |
tree | 594d42b3497583933e16b72ff161b3ffad4d96f6 /fxjs | |
parent | 453d786b16e431ee9e8174de8b0c62358d81a8a0 (diff) | |
download | pdfium-8bafef176a2a810373a386373fa3f558ae427984.tar.xz |
Roll {Set|Get}ScriptContent into {Set|Get}Content
The SetContent method was a proxy to SetScriptContent. The GetContent
added a default param value. The methods have been merged and the
GetContent call sites updated to pass in the needed value.
Change-Id: I61f950bef8beec7157bdb22e0a25904729f9e00a
Reviewed-on: https://pdfium-review.googlesource.com/17613
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs')
-rw-r--r-- | fxjs/cjx_node.cpp | 80 | ||||
-rw-r--r-- | fxjs/cjx_node.h | 9 |
2 files changed, 34 insertions, 55 deletions
diff --git a/fxjs/cjx_node.cpp b/fxjs/cjx_node.cpp index 0a053eec3e..e0fbe2f51d 100644 --- a/fxjs/cjx_node.cpp +++ b/fxjs/cjx_node.cpp @@ -1454,9 +1454,9 @@ void CJX_Node::Script_Som_DefaultValue(CFXJSE_Value* pValue, if (pContainerWidgetData) { pContainerWidgetData->GetFormatDataValue(wsNewValue, wsFormatValue); } - SetScriptContent(wsNewValue, wsFormatValue, true, true, true); + SetContent(wsNewValue, wsFormatValue, true, true, true); } else { - WideString content = GetScriptContent(true); + WideString content = GetContent(true); if (content.IsEmpty() && eType != XFA_Element::Text && eType != XFA_Element::SubmitUrl) { pValue->SetNull(); @@ -1479,7 +1479,7 @@ void CJX_Node::Script_Som_DefaultValue_Read(CFXJSE_Value* pValue, return; } - WideString content = GetScriptContent(true); + WideString content = GetContent(true); if (content.IsEmpty()) { pValue->SetNull(); return; @@ -1503,9 +1503,9 @@ void CJX_Node::Script_Boolean_Value(CFXJSE_Value* pValue, if (pContainerWidgetData) { pContainerWidgetData->GetFormatDataValue(wsNewValue, wsFormatValue); } - SetScriptContent(wsNewValue, wsFormatValue, true, true, true); + SetContent(wsNewValue, wsFormatValue, true, true, true); } else { - WideString wsValue = GetScriptContent(true); + WideString wsValue = GetContent(true); pValue->SetBoolean(wsValue == L"1"); } } @@ -1630,11 +1630,11 @@ void CJX_Node::Script_Draw_DefaultValue(CFXJSE_Value* pValue, if (uiType == XFA_Element::Text) { WideString wsNewValue = pValue->ToWideString(); WideString wsFormatValue(wsNewValue); - SetScriptContent(wsNewValue, wsFormatValue, true, true, true); + SetContent(wsNewValue, wsFormatValue, true, true, true); } } } else { - WideString content = GetScriptContent(true); + WideString content = GetContent(true); if (content.IsEmpty()) pValue->SetNull(); else @@ -1676,9 +1676,9 @@ void CJX_Node::Script_Field_DefaultValue(CFXJSE_Value* pValue, if (pContainerWidgetData) { pContainerWidgetData->GetFormatDataValue(wsNewText, wsFormatText); } - SetScriptContent(wsNewText, wsFormatText, true, true, true); + SetContent(wsNewText, wsFormatText, true, true, true); } else { - WideString content = GetScriptContent(true); + WideString content = GetContent(true); if (content.IsEmpty()) { pValue->SetNull(); } else { @@ -2067,7 +2067,7 @@ void CJX_Node::Script_ExclGroup_DefaultAndRawValue(CFXJSE_Value* pValue, pWidgetData->SetSelectedMemberByValue(pValue->ToWideString().AsStringView(), true, true, true); } else { - WideString wsValue = GetScriptContent(true); + WideString wsValue = GetContent(true); XFA_VERSION curVersion = GetDocument()->GetCurVersionMode(); if (wsValue.IsEmpty() && curVersion >= XFA_VERSION_300) { pValue->SetNull(); @@ -3332,11 +3332,11 @@ bool CJX_Node::TryUserData(void* pKey, void*& pData, bool bProtoAlso) { return iBytes == sizeof(void*) && memcpy(&pData, pData, iBytes); } -bool CJX_Node::SetScriptContent(const WideString& wsContent, - const WideString& wsXMLValue, - bool bNotify, - bool bScriptModify, - bool bSyncData) { +bool CJX_Node::SetContent(const WideString& wsContent, + const WideString& wsXMLValue, + bool bNotify, + bool bScriptModify, + bool bSyncData) { CXFA_Node* pNode = nullptr; CXFA_Node* pBindNode = nullptr; switch (GetXFANode()->GetObjectType()) { @@ -3350,8 +3350,8 @@ bool CJX_Node::SetScriptContent(const WideString& wsContent, ASSERT(pChildValue); pChildValue->JSNode()->SetCData(XFA_ATTRIBUTE_ContentType, L"text/xml", false, false); - pChildValue->JSNode()->SetScriptContent(wsContent, wsContent, bNotify, - bScriptModify, false); + pChildValue->JSNode()->SetContent(wsContent, wsContent, bNotify, + bScriptModify, false); CXFA_Node* pBind = GetXFANode()->GetBindData(); if (bSyncData && pBind) { std::vector<WideString> wsSaveTextArray; @@ -3415,8 +3415,8 @@ bool CJX_Node::SetScriptContent(const WideString& wsContent, } for (CXFA_Node* pArrayNode : pBind->GetBindItems()) { if (pArrayNode != GetXFANode()) { - pArrayNode->JSNode()->SetScriptContent( - wsContent, wsContent, bNotify, bScriptModify, false); + pArrayNode->JSNode()->SetContent(wsContent, wsContent, bNotify, + bScriptModify, false); } } } @@ -3431,17 +3431,17 @@ bool CJX_Node::SetScriptContent(const WideString& wsContent, CXFA_Node* pChildValue = pValue->GetNodeItem(XFA_NODEITEM_FirstChild); ASSERT(pChildValue); - pChildValue->JSNode()->SetScriptContent(wsContent, wsContent, bNotify, - bScriptModify, false); + pChildValue->JSNode()->SetContent(wsContent, wsContent, bNotify, + bScriptModify, false); } pBindNode = GetXFANode()->GetBindData(); if (pBindNode && bSyncData) { - pBindNode->JSNode()->SetScriptContent(wsContent, wsXMLValue, bNotify, - bScriptModify, false); + pBindNode->JSNode()->SetContent(wsContent, wsXMLValue, bNotify, + bScriptModify, false); for (CXFA_Node* pArrayNode : pBindNode->GetBindItems()) { if (pArrayNode != GetXFANode()) { - pArrayNode->JSNode()->SetScriptContent(wsContent, wsContent, - bNotify, true, false); + pArrayNode->JSNode()->SetContent(wsContent, wsContent, bNotify, + true, false); } } } @@ -3466,7 +3466,7 @@ bool CJX_Node::SetScriptContent(const WideString& wsContent, : XFA_Element::Sharptext); GetXFANode()->InsertChild(pContentRawDataNode); } - return pContentRawDataNode->JSNode()->SetScriptContent( + return pContentRawDataNode->JSNode()->SetContent( wsContent, wsXMLValue, bNotify, bScriptModify, bSyncData); } case XFA_ObjectType::NodeC: @@ -3485,8 +3485,8 @@ bool CJX_Node::SetScriptContent(const WideString& wsContent, if (pParent && pParent->IsContainerNode()) { pBindNode = pParent->GetBindData(); if (pBindNode) { - pBindNode->JSNode()->SetScriptContent( - wsContent, wsXMLValue, bNotify, bScriptModify, false); + pBindNode->JSNode()->SetContent(wsContent, wsXMLValue, bNotify, + bScriptModify, false); } } } @@ -3505,31 +3505,18 @@ bool CJX_Node::SetScriptContent(const WideString& wsContent, SetAttributeValue(wsContent, wsXMLValue, bNotify, bScriptModify); if (pBindNode && bSyncData) { for (CXFA_Node* pArrayNode : pBindNode->GetBindItems()) { - pArrayNode->JSNode()->SetScriptContent(wsContent, wsContent, bNotify, - bScriptModify, false); + pArrayNode->JSNode()->SetContent(wsContent, wsContent, bNotify, + bScriptModify, false); } } return true; } -bool CJX_Node::SetContent(const WideString& wsContent, - const WideString& wsXMLValue, - bool bNotify, - bool bScriptModify, - bool bSyncData) { - return SetScriptContent(wsContent, wsXMLValue, bNotify, bScriptModify, - bSyncData); -} - -WideString CJX_Node::GetScriptContent(bool bScriptModify) { +WideString CJX_Node::GetContent(bool bScriptModify) { WideString wsContent; return TryContent(wsContent, bScriptModify, true) ? wsContent : WideString(); } -WideString CJX_Node::GetContent() { - return GetScriptContent(false); -} - bool CJX_Node::TryContent(WideString& wsContent, bool bScriptModify, bool bProto) { @@ -3886,14 +3873,13 @@ void CJX_Node::MoveBufferMapData(CXFA_Node* pDstModule, void* pKey) { } } if (pDstModule->IsNodeV()) { - WideString wsValue = pDstModule->JSNode()->GetScriptContent(false); + WideString wsValue = pDstModule->JSNode()->GetContent(false); WideString wsFormatValue(wsValue); CXFA_WidgetData* pWidgetData = pDstModule->GetContainerWidgetData(); if (pWidgetData) { pWidgetData->GetFormatDataValue(wsValue, wsFormatValue); } - pDstModule->JSNode()->SetScriptContent(wsValue, wsFormatValue, true, true, - true); + pDstModule->JSNode()->SetContent(wsValue, wsFormatValue, true, true, true); } } diff --git a/fxjs/cjx_node.h b/fxjs/cjx_node.h index 130f759812..1864643f91 100644 --- a/fxjs/cjx_node.h +++ b/fxjs/cjx_node.h @@ -78,7 +78,7 @@ class CJX_Node : public CJX_Object { bool bNotify, bool bScriptModify, bool bSyncData); - WideString GetContent(); + WideString GetContent(bool bScriptModify); bool TryInteger(XFA_ATTRIBUTE eAttr, int32_t& iValue, bool bUseDefault); bool SetInteger(XFA_ATTRIBUTE eAttr, int32_t iValue, bool bNotify); @@ -428,13 +428,6 @@ class CJX_Node : public CJX_Object { bool TryUserData(void* pKey, void*& pData, bool bProtoAlso); - bool SetScriptContent(const WideString& wsContent, - const WideString& wsXMLValue, - bool bNotify, - bool bScriptModify, - bool bSyncData); - WideString GetScriptContent(bool bScriptModify); - XFA_MAPMODULEDATA* CreateMapModuleData(); XFA_MAPMODULEDATA* GetMapModuleData() const; void SetMapModuleValue(void* pKey, void* pValue); |