Remove the packets from attribute data.

Now that the attributes are stored per node we don't need to store the
packets for a given attribute as the node is already restricted to
certain packets.

Change-Id: Ic8916f5e045a14a437e1487445c0742e6d5def44
Reviewed-on: https://pdfium-review.googlesource.com/19830
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

1 files changed, 18 insertions, 45 deletions

diff --git a/xfa/fxfa/parser/cxfa_barcode.cpp b/xfa/fxfa/parser/cxfa_barcode.cpp
index a6604e6c7f..f81e6caa13 100644
--- a/xfa/fxfa/parser/cxfa_barcode.cpp
+++ b/xfa/fxfa/parser/cxfa_barcode.cpp
@@ -9,59 +9,32 @@
 namespace {
 
 const CXFA_Node::AttributeData kAttributeData[] = {
-    {XFA_Attribute::Id, XFA_AttributeType::CData,
-     XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template |
-         XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form,
-     nullptr},
-    {XFA_Attribute::DataRowCount, XFA_AttributeType::CData,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr},
-    {XFA_Attribute::Use, XFA_AttributeType::CData,
-     XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template |
-         XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form,
-     nullptr},
+    {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr},
+    {XFA_Attribute::DataRowCount, XFA_AttributeType::CData, nullptr},
+    {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr},
     {XFA_Attribute::DataPrep, XFA_AttributeType::Enum,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form,
      (void*)XFA_ATTRIBUTEENUM_None},
-    {XFA_Attribute::Type, XFA_AttributeType::CData,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)nullptr},
+    {XFA_Attribute::Type, XFA_AttributeType::CData, (void*)nullptr},
     {XFA_Attribute::TextLocation, XFA_AttributeType::Enum,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form,
      (void*)XFA_ATTRIBUTEENUM_Below},
-    {XFA_Attribute::ModuleWidth, XFA_AttributeType::Measure,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0.25mm"},
-    {XFA_Attribute::PrintCheckDigit, XFA_AttributeType::Boolean,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0},
-    {XFA_Attribute::ModuleHeight, XFA_AttributeType::Measure,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"5mm"},
-    {XFA_Attribute::StartChar, XFA_AttributeType::CData,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr},
-    {XFA_Attribute::Truncate, XFA_AttributeType::Boolean,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0},
-    {XFA_Attribute::WideNarrowRatio, XFA_AttributeType::CData,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"3:1"},
-    {XFA_Attribute::ErrorCorrectionLevel, XFA_AttributeType::CData,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr},
+    {XFA_Attribute::ModuleWidth, XFA_AttributeType::Measure, (void*)L"0.25mm"},
+    {XFA_Attribute::PrintCheckDigit, XFA_AttributeType::Boolean, (void*)0},
+    {XFA_Attribute::ModuleHeight, XFA_AttributeType::Measure, (void*)L"5mm"},
+    {XFA_Attribute::StartChar, XFA_AttributeType::CData, nullptr},
+    {XFA_Attribute::Truncate, XFA_AttributeType::Boolean, (void*)0},
+    {XFA_Attribute::WideNarrowRatio, XFA_AttributeType::CData, (void*)L"3:1"},
+    {XFA_Attribute::ErrorCorrectionLevel, XFA_AttributeType::CData, nullptr},
     {XFA_Attribute::UpsMode, XFA_AttributeType::Enum,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form,
      (void*)XFA_ATTRIBUTEENUM_UsCarrier},
     {XFA_Attribute::Checksum, XFA_AttributeType::Enum,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form | XFA_XDPPACKET_Form,
      (void*)XFA_ATTRIBUTEENUM_None},
-    {XFA_Attribute::CharEncoding, XFA_AttributeType::CData,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"UTF-8"},
-    {XFA_Attribute::Usehref, XFA_AttributeType::CData,
-     XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template |
-         XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form,
-     nullptr},
-    {XFA_Attribute::DataColumnCount, XFA_AttributeType::CData,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr},
-    {XFA_Attribute::RowColumnRatio, XFA_AttributeType::CData,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr},
-    {XFA_Attribute::DataLength, XFA_AttributeType::CData,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr},
-    {XFA_Attribute::EndChar, XFA_AttributeType::CData,
-     XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr},
-    {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}};
+    {XFA_Attribute::CharEncoding, XFA_AttributeType::CData, (void*)L"UTF-8"},
+    {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr},
+    {XFA_Attribute::DataColumnCount, XFA_AttributeType::CData, nullptr},
+    {XFA_Attribute::RowColumnRatio, XFA_AttributeType::CData, nullptr},
+    {XFA_Attribute::DataLength, XFA_AttributeType::CData, nullptr},
+    {XFA_Attribute::EndChar, XFA_AttributeType::CData, nullptr},
+    {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}};
 
 constexpr wchar_t kName[] = L"barcode";