commit 49cc930fca516eb75c0a43a047062417e9c0ca6e
author Haibo Huang <hhb@google.com> Mon Apr 27 16:14:24 2020 -0700
committer Haibo Huang <hhb@google.com> Tue May 05 06:45:11 2020 +0000
tree 18b7d6644eb876c364273b2a939939d4d7fa682d
parent d5e904168eee13897179219c6bdb1ea13acf5b74

Merge commit '04bb1f2f035343217875ce0fc19d3a7abde41717' into HEAD

Bug: 155031873
Change-Id: Ie7dc3f5c4b8999adf8e8885761fe65fd6ee65227
Merged-In: Ie7dc3f5c4b8999adf8e8885761fe65fd6ee65227

xfa/fxfa/parser/cxfa_bookend.cpp

diff --git a/xfa/fxfa/parser/cxfa_bookend.cpp b/xfa/fxfa/parser/cxfa_bookend.cpp
index 6b172be..143a484 100644
--- a/xfa/fxfa/parser/cxfa_bookend.cpp
+++ b/xfa/fxfa/parser/cxfa_bookend.cpp
@@ -6,20 +6,18 @@
 
 #include "xfa/fxfa/parser/cxfa_bookend.h"
 
-#include "fxjs/xfa/cjx_bookend.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
 
-const CXFA_Node::AttributeData kAttributeData[] = {
+const CXFA_Node::AttributeData kBookendAttributeData[] = {
     {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr},
     {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr},
     {XFA_Attribute::Trailer, XFA_AttributeType::CData, nullptr},
     {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr},
     {XFA_Attribute::Leader, XFA_AttributeType::CData, nullptr},
-    {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}};
-
-constexpr wchar_t kName[] = L"bookend";
+};
 
 }  // namespace
 
@@ -29,9 +27,8 @@
                 (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form),
                 XFA_ObjectType::Node,
                 XFA_Element::Bookend,
-                nullptr,
-                kAttributeData,
-                kName,
-                pdfium::MakeUnique<CJX_Bookend>(this)) {}
+                {},
+                kBookendAttributeData,
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
-CXFA_Bookend::~CXFA_Bookend() {}
+CXFA_Bookend::~CXFA_Bookend() = default;