Pass element hash and name into CXFA_Object constructor.

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>
@@ skipping 30 matching lines @@
   XFA_NodeFlag_SkipDataBinding = 1 << 5,
   XFA_NodeFlag_OwnXMLNode = 1 << 6,
   XFA_NodeFlag_UnusedNode = 1 << 7,
   XFA_NodeFlag_LayoutGeneratedNode = 1 << 8
 };
 
 class CXFA_Object : public CFXJSE_HostObject {
  public:
   CXFA_Object(CXFA_Document* pDocument,
               XFA_ObjectType objectType,
-              XFA_Element eType);
+              XFA_Element eType,
+              uint32_t elementNameHash,
+              const CFX_WideStringC& elementName);
   ~CXFA_Object() override;
 
   CXFA_Document* GetDocument() const { return m_pDocument; }
   XFA_ObjectType GetObjectType() const { return m_objectType; }
 
   bool IsNode() const {
     return m_objectType == XFA_ObjectType::Node ||
            m_objectType == XFA_ObjectType::NodeC ||
            m_objectType == XFA_ObjectType::NodeV ||
            m_objectType == XFA_ObjectType::ModelNode ||
@@ skipping 15 matching lines @@
     return m_objectType == XFA_ObjectType::VariablesThis;
   }
 
   CXFA_Node* AsNode();
   CXFA_NodeList* AsNodeList();
 
   const CXFA_Node* AsNode() const;
   const CXFA_NodeList* AsNodeList() const;
 
   XFA_Element GetElementType() const;
-  CFX_WideStringC GetClassName() const;
+  const CFX_WideStringC GetClassName() const;

[Lei Zhang, 2016/06/28 15:12:03]

Is the const useful?

[dsinclair, 2016/06/28 15:42:09]

Probably not, removed.

   uint32_t GetClassHashCode() const;
   void Script_ObjectClass_ClassName(CFXJSE_Value* pValue,
                                     FX_BOOL bSetting,
                                     XFA_ATTRIBUTE eAttribute);
   void ThrowException(int32_t iStringID, ...);
 
  protected:
   CXFA_Document* const m_pDocument;
   const XFA_ObjectType m_objectType;
   const XFA_Element m_elementType;
+
+  const uint32_t m_elementNameHash;
+  const CFX_WideStringC m_elementName;
 };
 using CXFA_ObjArray = CFX_ArrayTemplate<CXFA_Object*>;
 
 #define XFA_NODEFILTER_Children 0x01
 #define XFA_NODEFILTER_Properties 0x02
 #define XFA_NODEFILTER_OneOfProperty 0x04
 #define XFA_CLONEFLAG_Content 0x01
 enum XFA_NODEITEM {
   XFA_NODEITEM_Parent,
   XFA_NODEITEM_FirstChild,
@@ skipping 504 matching lines @@
   void Script_Script_Stateless(CFXJSE_Value* pValue,
                                FX_BOOL bSetting,
                                XFA_ATTRIBUTE eAttribute);
 
  protected:
   friend class CXFA_Document;
 
   CXFA_Node(CXFA_Document* pDoc,
             uint16_t ePacket,
             XFA_ObjectType oType,
-            XFA_Element eType);
+            XFA_Element eType,
+            uint32_t elementNameHash,
+            const CFX_WideStringC& elementName);
   ~CXFA_Node() override;
 
   bool HasFlag(XFA_NodeFlag dwFlag) const;
   CXFA_Node* Deprecated_GetPrevSibling();
   FX_BOOL SetValue(XFA_ATTRIBUTE eAttr,
                    XFA_ATTRIBUTETYPE eType,
                    void* pValue,
                    bool bNotify);
   FX_BOOL GetValue(XFA_ATTRIBUTE eAttr,
                    XFA_ATTRIBUTETYPE eType,
@@ skipping 168 matching lines @@
 
 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_