summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-06-23 07:56:38 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-23 07:56:38 -0700
commita5c85987a7604c0915268cb694f03f3452fdac6a (patch)
treefa4d79c0a9f25977d57e74ba520b9c416618f7db
parent937a11304dbf7abd97b76da8154e2b3bf5141aeb (diff)
downloadpdfium-a5c85987a7604c0915268cb694f03f3452fdac6a.tar.xz
Remove IsOrdinaryList; rename to OrdinaryList to List
IsOrdinaryList is no longer used, removed. Rename list item as Ordinary doesn't hold any meaning. Review-Url: https://codereview.chromium.org/2079393006
-rw-r--r--xfa/fxfa/parser/xfa_basic_data.cpp2
-rw-r--r--xfa/fxfa/parser/xfa_object.h5
2 files changed, 2 insertions, 5 deletions
diff --git a/xfa/fxfa/parser/xfa_basic_data.cpp b/xfa/fxfa/parser/xfa_basic_data.cpp
index be1df934c2..1a9ad1ade3 100644
--- a/xfa/fxfa/parser/xfa_basic_data.cpp
+++ b/xfa/fxfa/parser/xfa_basic_data.cpp
@@ -1708,7 +1708,7 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
{0xf616da28, L"line", XFA_Element::Line,
XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, XFA_ObjectType::Node},
{0xf616f3dc, L"list", XFA_Element::List, XFA_XDPPACKET_XDP,
- XFA_ObjectType::OrdinaryList},
+ XFA_ObjectType::List},
{0xf7055fb1, L"source", XFA_Element::Source, XFA_XDPPACKET_SourceSet,
XFA_ObjectType::Node},
{0xf7eebe1c, L"occur", XFA_Element::Occur,
diff --git a/xfa/fxfa/parser/xfa_object.h b/xfa/fxfa/parser/xfa_object.h
index 8b1f2303f6..09d8183ce3 100644
--- a/xfa/fxfa/parser/xfa_object.h
+++ b/xfa/fxfa/parser/xfa_object.h
@@ -19,7 +19,7 @@ class CXFA_NodeList;
enum class XFA_ObjectType {
Object,
- OrdinaryList,
+ List,
NodeList,
Node,
NodeC,
@@ -65,9 +65,6 @@ class CXFA_Object : public CFXJSE_HostObject {
m_objectType == XFA_ObjectType::VariablesThis;
}
bool IsNodeList() const { return m_objectType == XFA_ObjectType::NodeList; }
- bool IsOrdinaryList() const {
- return m_objectType == XFA_ObjectType::OrdinaryList;
- }
bool IsContentNode() const {
return m_objectType == XFA_ObjectType::ContentNode;
}