Fold CXFA_BindItemsData into CXFA_BindItems

This CL merges CXFA_BindItemsData into the CXFA_BindItems class.

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

4 files changed, 16 insertions, 48 deletions

diff --git a/xfa/fxfa/parser/cxfa_binditems.cpp b/xfa/fxfa/parser/cxfa_binditems.cpp
index 1c33e4c1c5..d7d72a7e3a 100644
--- a/xfa/fxfa/parser/cxfa_binditems.cpp
+++ b/xfa/fxfa/parser/cxfa_binditems.cpp
@@ -34,3 +34,15 @@ CXFA_BindItems::CXFA_BindItems(CXFA_Document* doc, XFA_PacketType packet)
                 pdfium::MakeUnique<CJX_BindItems>(this)) {}
 
 CXFA_BindItems::~CXFA_BindItems() {}
+
+WideString CXFA_BindItems::GetLabelRef() {
+  return JSObject()->GetCData(XFA_Attribute::LabelRef);
+}
+
+WideString CXFA_BindItems::GetValueRef() {
+  return JSObject()->GetCData(XFA_Attribute::ValueRef);
+}
+
+WideString CXFA_BindItems::GetRef() {
+  return JSObject()->GetCData(XFA_Attribute::Ref);
+}
diff --git a/xfa/fxfa/parser/cxfa_binditems.h b/xfa/fxfa/parser/cxfa_binditems.h
index f2263429b1..f1a490d13e 100644
--- a/xfa/fxfa/parser/cxfa_binditems.h
+++ b/xfa/fxfa/parser/cxfa_binditems.h
@@ -13,6 +13,10 @@ class CXFA_BindItems : public CXFA_Node {
  public:
   CXFA_BindItems(CXFA_Document* doc, XFA_PacketType packet);
   ~CXFA_BindItems() override;
+
+  WideString GetLabelRef();
+  WideString GetValueRef();
+  WideString GetRef();
 };
 
 #endif  // XFA_FXFA_PARSER_CXFA_BINDITEMS_H_
diff --git a/xfa/fxfa/parser/cxfa_binditemsdata.cpp b/xfa/fxfa/parser/cxfa_binditemsdata.cpp
deleted file mode 100644
index 0477d3e5d5..0000000000
--- a/xfa/fxfa/parser/cxfa_binditemsdata.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2016 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "xfa/fxfa/parser/cxfa_binditemsdata.h"
-
-#include "xfa/fxfa/parser/cxfa_node.h"
-
-CXFA_BindItemsData::CXFA_BindItemsData(CXFA_Node* pNode)
-    : CXFA_DataData(pNode) {}
-
-WideString CXFA_BindItemsData::GetLabelRef() const {
-  return m_pNode->JSObject()->GetCData(XFA_Attribute::LabelRef);
-}
-
-WideString CXFA_BindItemsData::GetValueRef() const {
-  return m_pNode->JSObject()->GetCData(XFA_Attribute::ValueRef);
-}
-
-WideString CXFA_BindItemsData::GetRef() const {
-  return m_pNode->JSObject()->GetCData(XFA_Attribute::Ref);
-}
diff --git a/xfa/fxfa/parser/cxfa_binditemsdata.h b/xfa/fxfa/parser/cxfa_binditemsdata.h
deleted file mode 100644
index ab4cac1836..0000000000
--- a/xfa/fxfa/parser/cxfa_binditemsdata.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2016 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXFA_PARSER_CXFA_BINDITEMSDATA_H_
-#define XFA_FXFA_PARSER_CXFA_BINDITEMSDATA_H_
-
-#include "core/fxcrt/fx_string.h"
-#include "xfa/fxfa/parser/cxfa_datadata.h"
-
-class CXFA_Node;
-
-class CXFA_BindItemsData : public CXFA_DataData {
- public:
-  explicit CXFA_BindItemsData(CXFA_Node* pNode);
-
-  WideString GetLabelRef() const;
-  WideString GetValueRef() const;
-  WideString GetRef() const;
-};
-
-#endif  // XFA_FXFA_PARSER_CXFA_BINDITEMSDATA_H_