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_margin.cpp

diff --git a/xfa/fxfa/parser/cxfa_margin.cpp b/xfa/fxfa/parser/cxfa_margin.cpp
index 265d7e9..5e58a88 100644
--- a/xfa/fxfa/parser/cxfa_margin.cpp
+++ b/xfa/fxfa/parser/cxfa_margin.cpp
@@ -6,14 +6,16 @@
 
 #include "xfa/fxfa/parser/cxfa_margin.h"
 
-#include "fxjs/xfa/cjx_margin.h"
+#include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
 
-const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0},
-                                                 {XFA_Element::Unknown, 0, 0}};
-const CXFA_Node::AttributeData kAttributeData[] = {
+const CXFA_Node::PropertyData kMarginPropertyData[] = {
+    {XFA_Element::Extras, 1, 0},
+};
+
+const CXFA_Node::AttributeData kMarginAttributeData[] = {
     {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr},
     {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr},
     {XFA_Attribute::LeftInset, XFA_AttributeType::Measure, (void*)L"0in"},
@@ -21,9 +23,7 @@
     {XFA_Attribute::TopInset, XFA_AttributeType::Measure, (void*)L"0in"},
     {XFA_Attribute::RightInset, XFA_AttributeType::Measure, (void*)L"0in"},
     {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr},
-    {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}};
-
-constexpr wchar_t kName[] = L"margin";
+};
 
 }  // namespace
 
@@ -33,12 +33,11 @@
                 (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form),
                 XFA_ObjectType::Node,
                 XFA_Element::Margin,
-                kPropertyData,
-                kAttributeData,
-                kName,
-                pdfium::MakeUnique<CJX_Margin>(this)) {}
+                kMarginPropertyData,
+                kMarginAttributeData,
+                pdfium::MakeUnique<CJX_Node>(this)) {}
 
-CXFA_Margin::~CXFA_Margin() {}
+CXFA_Margin::~CXFA_Margin() = default;
 
 float CXFA_Margin::GetLeftInset() const {
   return TryLeftInset().value_or(0);