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>

1 files changed, 16 insertions, 51 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);
 }