summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-02 18:15:07 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-02 18:15:07 +0000
commit77fe069bd19ea8207664293f631c63dab330f825 (patch)
tree25ecc84aefed75c57c7783e464392591d71cc692
parentf45406f8ec992560353756cff1e2c3931984e62b (diff)
downloadpdfium-77fe069bd19ea8207664293f631c63dab330f825.tar.xz
Remove default value to CJX_Node::SetAttribute
The bNotify value has been moved into the call sites and the default removed. Change-Id: Ifd2c0252b0f1421f7fc244d69e6f6bddc80e5591 Reviewed-on: https://pdfium-review.googlesource.com/17450 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
-rw-r--r--fxjs/cjx_node.cpp8
-rw-r--r--fxjs/cjx_node.h5
-rw-r--r--xfa/fxfa/parser/cxfa_image.cpp2
-rw-r--r--xfa/fxfa/parser/cxfa_nodehelper.cpp2
-rw-r--r--xfa/fxfa/parser/cxfa_simple_parser.cpp6
5 files changed, 12 insertions, 11 deletions
diff --git a/fxjs/cjx_node.cpp b/fxjs/cjx_node.cpp
index 64894b7c7e..3fd08772e2 100644
--- a/fxjs/cjx_node.cpp
+++ b/fxjs/cjx_node.cpp
@@ -2732,7 +2732,8 @@ void CJX_Node::Script_Form_Checksum(CFXJSE_Value* pValue,
bool bSetting,
XFA_ATTRIBUTE eAttribute) {
if (bSetting) {
- SetAttribute(XFA_ATTRIBUTE_Checksum, pValue->ToWideString().AsStringView());
+ SetAttribute(XFA_ATTRIBUTE_Checksum, pValue->ToWideString().AsStringView(),
+ false);
return;
}
WideString wsChecksum;
@@ -3440,7 +3441,8 @@ bool CJX_Node::SetScriptContent(const WideString& wsContent,
GetAttribute(XFA_ATTRIBUTE_ContentType, wsContentType, false);
if (wsContentType == L"text/html") {
wsContentType = L"";
- SetAttribute(XFA_ATTRIBUTE_ContentType, wsContentType.AsStringView());
+ SetAttribute(XFA_ATTRIBUTE_ContentType, wsContentType.AsStringView(),
+ false);
}
}
CXFA_Node* pContentRawDataNode =
@@ -3531,7 +3533,7 @@ bool CJX_Node::TryContent(WideString& wsContent,
CXFA_Node* pChildValue = pValue->GetNodeItem(XFA_NODEITEM_FirstChild);
if (pChildValue && XFA_FieldIsMultiListBox(GetXFANode())) {
pChildValue->JSNode()->SetAttribute(XFA_ATTRIBUTE_ContentType,
- L"text/xml");
+ L"text/xml", false);
}
return pChildValue ? pChildValue->JSNode()->TryContent(
wsContent, bScriptModify, bProto)
diff --git a/fxjs/cjx_node.h b/fxjs/cjx_node.h
index 77c564e11b..47fb0d62f0 100644
--- a/fxjs/cjx_node.h
+++ b/fxjs/cjx_node.h
@@ -55,11 +55,10 @@ class CJX_Node : public CJX_Object {
bool HasAttribute(XFA_ATTRIBUTE eAttr);
bool SetAttribute(XFA_ATTRIBUTE eAttr,
const WideStringView& wsValue,
- bool bNotify = false);
-
+ bool bNotify);
bool SetAttribute(const WideStringView& wsAttr,
const WideStringView& wsValue,
- bool bNotify = false);
+ bool bNotify);
bool GetAttribute(const WideStringView& wsAttr,
WideString& wsValue,
bool bUseDefault = true);
diff --git a/xfa/fxfa/parser/cxfa_image.cpp b/xfa/fxfa/parser/cxfa_image.cpp
index cfa3db76f1..34072392f7 100644
--- a/xfa/fxfa/parser/cxfa_image.cpp
+++ b/xfa/fxfa/parser/cxfa_image.cpp
@@ -43,7 +43,7 @@ bool CXFA_Image::SetHref(const WideString& wsHref) {
if (m_bDefValue)
return m_pNode->JSNode()->SetCData(XFA_ATTRIBUTE_Href, wsHref);
return m_pNode->JSNode()->SetAttribute(XFA_ATTRIBUTE_Href,
- wsHref.AsStringView());
+ wsHref.AsStringView(), false);
}
bool CXFA_Image::SetTransferEncoding(int32_t iTransferEncoding) {
diff --git a/xfa/fxfa/parser/cxfa_nodehelper.cpp b/xfa/fxfa/parser/cxfa_nodehelper.cpp
index 6bf7cc20b6..d8ccf8517c 100644
--- a/xfa/fxfa/parser/cxfa_nodehelper.cpp
+++ b/xfa/fxfa/parser/cxfa_nodehelper.cpp
@@ -358,7 +358,7 @@ bool CXFA_NodeHelper::ResolveNodes_CreateNode(WideString wsName,
CXFA_Node* pNewNode = m_pCreateParent->CreateSamePacketNode(eClassType);
if (pNewNode) {
pNewNode->JSNode()->SetAttribute(XFA_ATTRIBUTE_Name,
- wsName.AsStringView());
+ wsName.AsStringView(), false);
pNewNode->CreateXMLMappingNode();
m_pCreateParent->InsertChild(pNewNode);
if (iIndex == m_iCreateCount - 1) {
diff --git a/xfa/fxfa/parser/cxfa_simple_parser.cpp b/xfa/fxfa/parser/cxfa_simple_parser.cpp
index 9d3f2b0222..c129214a50 100644
--- a/xfa/fxfa/parser/cxfa_simple_parser.cpp
+++ b/xfa/fxfa/parser/cxfa_simple_parser.cpp
@@ -651,7 +651,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_TemplateForm(
pNode->JSNode()->SetCData(XFA_ATTRIBUTE_Name,
XFA_GetPacketByIndex(XFA_PACKET_Form)->pName);
pNode->JSNode()->SetAttribute(XFA_ATTRIBUTE_Checksum,
- wsChecksum.AsStringView());
+ wsChecksum.AsStringView(), false);
CXFA_Node* pTemplateRoot =
m_pRootNode->GetFirstChildByClass(XFA_Element::Template);
CXFA_Node* pTemplateChosen =
@@ -877,7 +877,7 @@ CXFA_Node* CXFA_SimpleParser::NormalLoader(CXFA_Node* pXFANode,
return nullptr;
if (ePacketID == XFA_XDPPACKET_Config) {
pXFAChild->JSNode()->SetAttribute(XFA_ATTRIBUTE_Name,
- wsTagName.AsStringView());
+ wsTagName.AsStringView(), false);
}
bool IsNeedValue = true;
@@ -897,7 +897,7 @@ CXFA_Node* CXFA_SimpleParser::NormalLoader(CXFA_Node* pXFANode,
continue;
}
pXFAChild->JSNode()->SetAttribute(lpAttrInfo->eName,
- it.second.AsStringView());
+ it.second.AsStringView(), false);
}
pXFANode->InsertChild(pXFAChild);
if (eType == XFA_Element::Validate || eType == XFA_Element::Locale) {