Cleanup CXFA_ImageData

This CL removes the second constructor parameter which is always true
and removes all related conditionals. The methods have been changed to
const and return instead of using out parameters.

Change-Id: Id6d2aa533a212e961e3b8169eef57b7e868d503e
Reviewed-on: https://pdfium-review.googlesource.com/19010
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>

4 files changed, 27 insertions, 66 deletions

diff --git a/xfa/fxfa/parser/cxfa_imagedata.cpp b/xfa/fxfa/parser/cxfa_imagedata.cpp
index 145d3586a5..dcf5563ad5 100644
--- a/xfa/fxfa/parser/cxfa_imagedata.cpp
+++ b/xfa/fxfa/parser/cxfa_imagedata.cpp
@@ -8,57 +8,29 @@
 
 #include "xfa/fxfa/parser/cxfa_node.h"
 
-CXFA_ImageData::CXFA_ImageData(CXFA_Node* pNode, bool bDefValue)
-    : CXFA_DataData(pNode), m_bDefValue(bDefValue) {}
+CXFA_ImageData::CXFA_ImageData(CXFA_Node* pNode) : CXFA_DataData(pNode) {}
 
-int32_t CXFA_ImageData::GetAspect() {
+XFA_ATTRIBUTEENUM CXFA_ImageData::GetAspect() const {
   return m_pNode->JSNode()->GetEnum(XFA_Attribute::Aspect);
 }
 
-bool CXFA_ImageData::GetContentType(WideString& wsContentType) {
-  pdfium::Optional<WideString> content =
-      m_pNode->JSNode()->TryCData(XFA_Attribute::ContentType, true);
-  if (!content)
-    return false;
-
-  wsContentType = *content;
-  return true;
+WideString CXFA_ImageData::GetContentType() const {
+  return m_pNode->JSNode()
+      ->TryCData(XFA_Attribute::ContentType, true)
+      .value_or(L"");
 }
 
-bool CXFA_ImageData::GetHref(WideString& wsHref) {
-  if (m_bDefValue) {
-    pdfium::Optional<WideString> ret =
-        m_pNode->JSNode()->TryCData(XFA_Attribute::Href, true);
-    if (!ret)
-      return false;
-
-    wsHref = *ret;
-    return true;
-  }
-  pdfium::Optional<WideString> ret =
-      m_pNode->JSNode()->TryAttribute(XFA_Attribute::Href, true);
-  if (!ret)
-    return false;
-
-  wsHref = *ret;
-  return true;
+WideString CXFA_ImageData::GetHref() const {
+  return m_pNode->JSNode()->TryCData(XFA_Attribute::Href, true).value_or(L"");
 }
 
-XFA_ATTRIBUTEENUM CXFA_ImageData::GetTransferEncoding() {
-  if (m_bDefValue) {
-    return static_cast<XFA_ATTRIBUTEENUM>(
-        m_pNode->JSNode()->GetEnum(XFA_Attribute::TransferEncoding));
-  }
-  return XFA_ATTRIBUTEENUM_Base64;
+XFA_ATTRIBUTEENUM CXFA_ImageData::GetTransferEncoding() const {
+  return static_cast<XFA_ATTRIBUTEENUM>(
+      m_pNode->JSNode()->GetEnum(XFA_Attribute::TransferEncoding));
 }
 
-bool CXFA_ImageData::GetContent(WideString& wsText) {
-  pdfium::Optional<WideString> ret = m_pNode->JSNode()->TryContent(false, true);
-  if (!ret)
-    return false;
-
-  wsText = *ret;
-  return true;
+WideString CXFA_ImageData::GetContent() const {
+  return m_pNode->JSNode()->TryContent(false, true).value_or(L"");
 }
 
 void CXFA_ImageData::SetContentType(const WideString& wsContentType) {
@@ -67,17 +39,10 @@ void CXFA_ImageData::SetContentType(const WideString& wsContentType) {
 }
 
 void CXFA_ImageData::SetHref(const WideString& wsHref) {
-  if (m_bDefValue) {
-    m_pNode->JSNode()->SetCData(XFA_Attribute::Href, wsHref, false, false);
-    return;
-  }
-  m_pNode->JSNode()->SetAttribute(XFA_Attribute::Href, wsHref.AsStringView(),
-                                  false);
+  m_pNode->JSNode()->SetCData(XFA_Attribute::Href, wsHref, false, false);
 }
 
 void CXFA_ImageData::SetTransferEncoding(XFA_ATTRIBUTEENUM iTransferEncoding) {
-  if (m_bDefValue) {
-    m_pNode->JSNode()->SetEnum(XFA_Attribute::TransferEncoding,
-                               iTransferEncoding, false);
-  }
+  m_pNode->JSNode()->SetEnum(XFA_Attribute::TransferEncoding, iTransferEncoding,
+                             false);
 }
diff --git a/xfa/fxfa/parser/cxfa_imagedata.h b/xfa/fxfa/parser/cxfa_imagedata.h
index b8e5141cd7..445d3d4fba 100644
--- a/xfa/fxfa/parser/cxfa_imagedata.h
+++ b/xfa/fxfa/parser/cxfa_imagedata.h
@@ -15,22 +15,19 @@ class CXFA_Node;
 
 class CXFA_ImageData : public CXFA_DataData {
  public:
-  CXFA_ImageData(CXFA_Node* pNode, bool bDefValue);
+  explicit CXFA_ImageData(CXFA_Node* pNode);
 
-  int32_t GetAspect();
-  bool GetContent(WideString& wsText);
+  XFA_ATTRIBUTEENUM GetAspect() const;
+  WideString GetContent() const;
 
-  bool GetHref(WideString& wsHref);
+  WideString GetHref() const;
   void SetHref(const WideString& wsHref);
 
-  XFA_ATTRIBUTEENUM GetTransferEncoding();
+  XFA_ATTRIBUTEENUM GetTransferEncoding() const;
   void SetTransferEncoding(XFA_ATTRIBUTEENUM iTransferEncoding);
 
-  bool GetContentType(WideString& wsContentType);
+  WideString GetContentType() const;
   void SetContentType(const WideString& wsContentType);
-
- private:
-  bool m_bDefValue;
 };
 
 #endif  // XFA_FXFA_PARSER_CXFA_IMAGEDATA_H_
diff --git a/xfa/fxfa/parser/cxfa_valuedata.cpp b/xfa/fxfa/parser/cxfa_valuedata.cpp
index e44a76dbcc..1ca051e637 100644
--- a/xfa/fxfa/parser/cxfa_valuedata.cpp
+++ b/xfa/fxfa/parser/cxfa_valuedata.cpp
@@ -59,7 +59,6 @@ CXFA_ExDataData CXFA_ValueData::GetExData() {
 }
 
 CXFA_ImageData CXFA_ValueData::GetImageData() {
-  return CXFA_ImageData(
-      m_pNode ? (m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild)) : nullptr,
-      true);
+  return CXFA_ImageData(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild)
+                                : nullptr);
 }
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
index 9e33b72936..b7b3c0c12e 100644
--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
@@ -142,9 +142,9 @@ void CreateDataBinding(CXFA_Node* pFormNode,
         WideString wsContentType;
         WideString wsHref;
         if (imageData.HasValidNode()) {
-          imageData.GetContent(wsValue);
-          imageData.GetContentType(wsContentType);
-          imageData.GetHref(wsHref);
+          wsValue = imageData.GetContent();
+          wsContentType = imageData.GetContentType();
+          wsHref = imageData.GetHref();
         }
         CFX_XMLElement* pXMLDataElement =
             static_cast<CFX_XMLElement*>(pDataNode->GetXMLMappingNode());