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_area.cpp | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_area.cpp') diff --git a/xfa/fxfa/parser/cxfa_area.cpp b/xfa/fxfa/parser/cxfa_area.cpp index b1a8f81db0..d3007fbf67 100644 --- a/xfa/fxfa/parser/cxfa_area.cpp +++ b/xfa/fxfa/parser/cxfa_area.cpp @@ -12,38 +12,17 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Desc, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::X, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Y, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | 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::Level, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Relevant, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::ColSpan, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::X, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Y, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Level, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Relevant, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::ColSpan, XFA_AttributeType::Integer, (void*)1}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"area"; -- cgit v1.2.3