Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(474)

Unified Diff: xfa/fxfa/parser/xfa_object.h

Issue 2082343003: Remove CXFA_OrdinaryObject class (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa_part_II
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/fxfa/parser/xfa_basic_data.cpp ('k') | xfa/fxfa/parser/xfa_object_imp.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fxfa/parser/xfa_object.h
diff --git a/xfa/fxfa/parser/xfa_object.h b/xfa/fxfa/parser/xfa_object.h
index 67e4a2efad181bd00675d87de66b91570a765e2d..8b1f2303f662ee8e4838d53b954c553bc7d9ca26 100644
--- a/xfa/fxfa/parser/xfa_object.h
+++ b/xfa/fxfa/parser/xfa_object.h
@@ -16,10 +16,9 @@
class CXFA_Document;
class CXFA_Node;
class CXFA_NodeList;
-class CXFA_OrdinaryObject;
enum class XFA_ObjectType {
- OrdinaryObject,
+ Object,
OrdinaryList,
NodeList,
Node,
@@ -65,9 +64,6 @@ class CXFA_Object : public CFXJSE_HostObject {
m_objectType == XFA_ObjectType::ContentNode ||
m_objectType == XFA_ObjectType::VariablesThis;
}
- bool IsOrdinaryObject() const {
- return m_objectType == XFA_ObjectType::OrdinaryObject;
- }
bool IsNodeList() const { return m_objectType == XFA_ObjectType::NodeList; }
bool IsOrdinaryList() const {
return m_objectType == XFA_ObjectType::OrdinaryList;
@@ -85,11 +81,9 @@ class CXFA_Object : public CFXJSE_HostObject {
}
CXFA_Node* AsNode();
- CXFA_OrdinaryObject* AsOrdinaryObject();
CXFA_NodeList* AsNodeList();
const CXFA_Node* AsNode() const;
- const CXFA_OrdinaryObject* AsOrdinaryObject() const;
const CXFA_NodeList* AsNodeList() const;
XFA_Element GetElementType() const;
@@ -684,12 +678,6 @@ class CXFA_Node : public CXFA_Object {
XFA_MAPMODULEDATA* m_pMapModuleData;
};
-class CXFA_OrdinaryObject : public CXFA_Object {
- public:
- CXFA_OrdinaryObject(CXFA_Document* pDocument, XFA_Element eElement);
- ~CXFA_OrdinaryObject() override;
-};
-
class CXFA_ThisProxy : public CXFA_Object {
public:
CXFA_ThisProxy(CXFA_Node* pThisNode, CXFA_Node* pScriptNode);
@@ -797,9 +785,7 @@ typedef CXFA_NodeIteratorTemplate<CXFA_Node, CXFA_TraverseStrategy_XFANode>
inline CXFA_Node* CXFA_Object::AsNode() {
return IsNode() ? static_cast<CXFA_Node*>(this) : nullptr;
}
-inline CXFA_OrdinaryObject* CXFA_Object::AsOrdinaryObject() {
- return IsOrdinaryObject() ? static_cast<CXFA_OrdinaryObject*>(this) : nullptr;
-}
+
inline CXFA_NodeList* CXFA_Object::AsNodeList() {
return IsNodeList() ? static_cast<CXFA_NodeList*>(this) : nullptr;
}
@@ -807,10 +793,7 @@ inline CXFA_NodeList* CXFA_Object::AsNodeList() {
inline const CXFA_Node* CXFA_Object::AsNode() const {
return IsNode() ? static_cast<const CXFA_Node*>(this) : nullptr;
}
-inline const CXFA_OrdinaryObject* CXFA_Object::AsOrdinaryObject() const {
- return IsOrdinaryObject() ? static_cast<const CXFA_OrdinaryObject*>(this)
- : nullptr;
-}
+
inline const CXFA_NodeList* CXFA_Object::AsNodeList() const {
return IsNodeList() ? static_cast<const CXFA_NodeList*>(this) : nullptr;
}
« no previous file with comments | « xfa/fxfa/parser/xfa_basic_data.cpp ('k') | xfa/fxfa/parser/xfa_object_imp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698