diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-30 20:22:20 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-30 20:22:20 +0000 |
commit | 21b08271e32f3142fb840b04adc5d2adb15f4f78 (patch) | |
tree | 2ce227f28759af44ddc9d66c81f3b83e6d5e01d0 /xfa/fxfa/parser/cxfa_hyphenation.cpp | |
parent | 5fda35f2b0a658e310f778c2dc40ef24e6d05975 (diff) | |
download | pdfium-21b08271e32f3142fb840b04adc5d2adb15f4f78.tar.xz |
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>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_hyphenation.cpp')
-rw-r--r-- | xfa/fxfa/parser/cxfa_hyphenation.cpp | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/xfa/fxfa/parser/cxfa_hyphenation.cpp b/xfa/fxfa/parser/cxfa_hyphenation.cpp index 543a6c91f2..1e7c8822b2 100644 --- a/xfa/fxfa/parser/cxfa_hyphenation.cpp +++ b/xfa/fxfa/parser/cxfa_hyphenation.cpp @@ -9,31 +9,16 @@ 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::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::WordCharacterCount, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)7}, - {XFA_Attribute::Hyphenate, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::ExcludeInitialCap, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::PushCharacterCount, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)3}, - {XFA_Attribute::RemainCharacterCount, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)3}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::ExcludeAllCaps, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::WordCharacterCount, XFA_AttributeType::Integer, (void*)7}, + {XFA_Attribute::Hyphenate, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::ExcludeInitialCap, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::PushCharacterCount, XFA_AttributeType::Integer, (void*)3}, + {XFA_Attribute::RemainCharacterCount, XFA_AttributeType::Integer, (void*)3}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::ExcludeAllCaps, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"hyphenation"; |