summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/cxfa_font.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-30 20:22:20 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-30 20:22:20 +0000
commit21b08271e32f3142fb840b04adc5d2adb15f4f78 (patch)
tree2ce227f28759af44ddc9d66c81f3b83e6d5e01d0 /xfa/fxfa/parser/cxfa_font.cpp
parent5fda35f2b0a658e310f778c2dc40ef24e6d05975 (diff)
downloadpdfium-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_font.cpp')
-rw-r--r--xfa/fxfa/parser/cxfa_font.cpp57
1 files changed, 18 insertions, 39 deletions
diff --git a/xfa/fxfa/parser/cxfa_font.cpp b/xfa/fxfa/parser/cxfa_font.cpp
index f6033461f2..06a869a628 100644
--- a/xfa/fxfa/parser/cxfa_font.cpp
+++ b/xfa/fxfa/parser/cxfa_font.cpp
@@ -12,57 +12,36 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Fill, 1, 0},
{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::LineThrough, XFA_AttributeType::Integer,
- XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0},
- {XFA_Attribute::Typeface, XFA_AttributeType::CData,
- XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form,
- (void*)L"Courier"},
+ {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr},
+ {XFA_Attribute::LineThrough, XFA_AttributeType::Integer, (void*)0},
+ {XFA_Attribute::Typeface, XFA_AttributeType::CData, (void*)L"Courier"},
{XFA_Attribute::FontHorizontalScale, XFA_AttributeType::CData,
- XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"100%"},
- {XFA_Attribute::Use, XFA_AttributeType::CData,
- XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template |
- XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form,
- nullptr},
+ (void*)L"100%"},
+ {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr},
{XFA_Attribute::KerningMode, XFA_AttributeType::Enum,
- XFA_XDPPACKET_Template | XFA_XDPPACKET_Form,
(void*)XFA_ATTRIBUTEENUM_None},
- {XFA_Attribute::Underline, XFA_AttributeType::Integer,
- XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0},
- {XFA_Attribute::BaselineShift, XFA_AttributeType::Measure,
- XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"},
+ {XFA_Attribute::Underline, XFA_AttributeType::Integer, (void*)0},
+ {XFA_Attribute::BaselineShift, XFA_AttributeType::Measure, (void*)L"0in"},
{XFA_Attribute::OverlinePeriod, XFA_AttributeType::Enum,
- XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_All},
- {XFA_Attribute::LetterSpacing, XFA_AttributeType::CData,
- XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr},
+ (void*)XFA_ATTRIBUTEENUM_All},
+ {XFA_Attribute::LetterSpacing, XFA_AttributeType::CData, nullptr},
{XFA_Attribute::LineThroughPeriod, XFA_AttributeType::Enum,
- XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_All},
+ (void*)XFA_ATTRIBUTEENUM_All},
{XFA_Attribute::FontVerticalScale, XFA_AttributeType::CData,
- XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"100%"},
- {XFA_Attribute::PsName, XFA_AttributeType::CData, XFA_XDPPACKET_Config,
- nullptr},
- {XFA_Attribute::Size, XFA_AttributeType::Measure,
- XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"10pt"},
+ (void*)L"100%"},
+ {XFA_Attribute::PsName, XFA_AttributeType::CData, nullptr},
+ {XFA_Attribute::Size, XFA_AttributeType::Measure, (void*)L"10pt"},
{XFA_Attribute::Posture, XFA_AttributeType::Enum,
- XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form,
(void*)XFA_ATTRIBUTEENUM_Normal},
- {XFA_Attribute::Usehref, XFA_AttributeType::CData,
- XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template |
- XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form,
- nullptr},
+ {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr},
{XFA_Attribute::Weight, XFA_AttributeType::Enum,
- XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form,
(void*)XFA_ATTRIBUTEENUM_Normal},
{XFA_Attribute::UnderlinePeriod, XFA_AttributeType::Enum,
- XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_All},
- {XFA_Attribute::Overline, XFA_AttributeType::Integer,
- XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0},
+ (void*)XFA_ATTRIBUTEENUM_All},
+ {XFA_Attribute::Overline, XFA_AttributeType::Integer, (void*)0},
{XFA_Attribute::GenericFamily, XFA_AttributeType::Enum,
- XFA_XDPPACKET_Config, (void*)XFA_ATTRIBUTEENUM_Serif},
- {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}};
+ (void*)XFA_ATTRIBUTEENUM_Serif},
+ {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}};
constexpr wchar_t kName[] = L"font";