Remove CXFA_OrdinaryObject class

xfa/fxfa/parser/xfa_object.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef XFA_FXFA_PARSER_XFA_OBJECT_H_
 #define XFA_FXFA_PARSER_XFA_OBJECT_H_
 
 #include <unordered_set>
 
 #include "fxjse/include/cfxjse_arguments.h"
 #include "xfa/fde/xml/fde_xml.h"
 #include "xfa/fxfa/parser/xfa_utils.h"
 
 class CXFA_Document;
 class CXFA_Node;
 class CXFA_NodeList;
-class CXFA_OrdinaryObject;
 
 enum class XFA_ObjectType {
-  OrdinaryObject,
+  Object,
   OrdinaryList,
   NodeList,
   Node,
   NodeC,
   NodeV,
   ModelNode,
   TextNode,
   ContainerNode,
   ContentNode,
   VariablesThis
@@ skipping 25 matching lines @@
   bool IsNode() const {
     return m_objectType == XFA_ObjectType::Node ||
            m_objectType == XFA_ObjectType::NodeC ||
            m_objectType == XFA_ObjectType::NodeV ||
            m_objectType == XFA_ObjectType::ModelNode ||
            m_objectType == XFA_ObjectType::TextNode ||
            m_objectType == XFA_ObjectType::ContainerNode ||
            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;
   }
   bool IsContentNode() const {
     return m_objectType == XFA_ObjectType::ContentNode;
   }
   bool IsContainerNode() const {
     return m_objectType == XFA_ObjectType::ContainerNode;
   }
   bool IsModelNode() const { return m_objectType == XFA_ObjectType::ModelNode; }
   bool IsNodeV() const { return m_objectType == XFA_ObjectType::NodeV; }
   bool IsVariablesThis() const {
     return m_objectType == XFA_ObjectType::VariablesThis;
   }
 
   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;
   void GetClassName(CFX_WideStringC& wsName) const;
   uint32_t GetClassHashCode() const;
   void Script_ObjectClass_ClassName(CFXJSE_Value* pValue,
                                     FX_BOOL bSetting,
                                     XFA_ATTRIBUTE eAttribute);
   void ThrowException(int32_t iStringID, ...);
 
@@ skipping 574 matching lines @@
   CXFA_Node* m_pLastChild;
   CXFA_Node* m_pParent;
   CFDE_XMLNode* m_pXMLNode;
   uint16_t m_ePacket;
   uint16_t m_uNodeFlags;
   uint32_t m_dwNameHash;
   CXFA_Node* m_pAuxNode;
   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);
   ~CXFA_ThisProxy() override;
 
   CXFA_Node* GetThisNode() const;
   CXFA_Node* GetScriptNode() const;
 
  private:
   CXFA_Node* m_pThisNode;
@@ skipping 87 matching lines @@
   static inline CXFA_Node* GetParent(CXFA_Node* pTemplateNode) {
     return pTemplateNode->GetNodeItem(XFA_NODEITEM_Parent);
   }
 };
 typedef CXFA_NodeIteratorTemplate<CXFA_Node, CXFA_TraverseStrategy_XFANode>
     CXFA_NodeIterator;
 
 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;
 }
 
 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;
 }
 
 inline CXFA_Node* ToNode(CXFA_Object* pObj) {
   return pObj ? pObj->AsNode() : nullptr;
 }
 
 inline const CXFA_Node* ToNode(const CXFA_Object* pObj) {
   return pObj ? pObj->AsNode() : nullptr;
 }
 
 #endif  // XFA_FXFA_PARSER_XFA_OBJECT_H_