From ec7d8e21e72562d664e9596cb73bae6da8d6703c Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 7 Feb 2018 19:57:25 +0000 Subject: Make xfa_fxfa_parser target jumbo capable. Mechanically uniquify all the kFoo variables in xfa/fxfa/parser. BUG=pdfium:964 Change-Id: Iffe15015282d572147f31f2101fa0127f2198620 Reviewed-on: https://pdfium-review.googlesource.com/25890 Reviewed-by: dsinclair Commit-Queue: Lei Zhang --- xfa/fxfa/parser/cxfa_rectangle.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_rectangle.cpp') diff --git a/xfa/fxfa/parser/cxfa_rectangle.cpp b/xfa/fxfa/parser/cxfa_rectangle.cpp index ac98df0bb7..632c782c39 100644 --- a/xfa/fxfa/parser/cxfa_rectangle.cpp +++ b/xfa/fxfa/parser/cxfa_rectangle.cpp @@ -15,11 +15,12 @@ namespace { -const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Edge, 4, 0}, - {XFA_Element::Corner, 4, 0}, - {XFA_Element::Fill, 1, 0}, - {XFA_Element::Unknown, 0, 0}}; -const CXFA_Node::AttributeData kAttributeData[] = { +const CXFA_Node::PropertyData kRectanglePropertyData[] = { + {XFA_Element::Edge, 4, 0}, + {XFA_Element::Corner, 4, 0}, + {XFA_Element::Fill, 1, 0}, + {XFA_Element::Unknown, 0, 0}}; +const CXFA_Node::AttributeData kRectangleAttributeData[] = { {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, @@ -27,7 +28,7 @@ const CXFA_Node::AttributeData kAttributeData[] = { (void*)XFA_AttributeEnum::Even}, {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; -constexpr wchar_t kName[] = L"rectangle"; +constexpr wchar_t kRectangleName[] = L"rectangle"; } // namespace @@ -37,9 +38,9 @@ CXFA_Rectangle::CXFA_Rectangle(CXFA_Document* doc, XFA_PacketType packet) (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), XFA_ObjectType::Node, XFA_Element::Rectangle, - kPropertyData, - kAttributeData, - kName, + kRectanglePropertyData, + kRectangleAttributeData, + kRectangleName, pdfium::MakeUnique(this)) {} CXFA_Rectangle::CXFA_Rectangle(CXFA_Document* pDoc, -- cgit v1.2.3