From 21b08271e32f3142fb840b04adc5d2adb15f4f78 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 30 Nov 2017 20:22:20 +0000 Subject: 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 Reviewed-by: Lei Zhang --- xfa/fxfa/parser/cxfa_break.cpp | 43 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 31 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_break.cpp') diff --git a/xfa/fxfa/parser/cxfa_break.cpp b/xfa/fxfa/parser/cxfa_break.cpp index 3f8a7fd7d6..7bbd3a8d80 100644 --- a/xfa/fxfa/parser/cxfa_break.cpp +++ b/xfa/fxfa/parser/cxfa_break.cpp @@ -11,41 +11,22 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; 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::BeforeTarget, 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::OverflowTarget, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::OverflowLeader, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::OverflowTrailer, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::StartNew, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::BookendTrailer, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::BeforeTarget, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::OverflowTarget, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::OverflowLeader, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::OverflowTrailer, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::StartNew, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::BookendTrailer, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::After, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::BookendLeader, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::AfterTarget, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::BookendLeader, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::AfterTarget, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Before, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"break"; -- cgit v1.2.3