Merge to XFA: CPDF_Object() constructor should set its internal m_Type variable.

core/include/fpdfapi/fpdf_objects.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 _FPDF_OBJECTS_
 #define _FPDF_OBJECTS_
 #ifndef _FXCRT_EXTENSION_
 #include "../fxcrt/fx_ext.h"
@@ skipping 73 matching lines @@
 
     void                                        SetUnicodeText(FX_LPCWSTR pUnicodes, int len = -1);
 
     int                                         GetDirectType() const;
 
     FX_BOOL                                     IsModified() const
     {
         return FALSE;
     }
 protected:
+    CPDF_Object(FX_DWORD type) : m_Type(type), m_ObjNum(0), m_GenNum(0) { }
+    ~CPDF_Object() { }
+
+    void                                        Destroy();
+
     FX_DWORD                            m_Type;
-    CPDF_Object()
-    {
-        m_ObjNum = 0;
-        m_GenNum = 0;
-    }
-
     FX_DWORD                            m_ObjNum;
     FX_DWORD                            m_GenNum;
 
-    void                                        Destroy();
-
-
-    ~CPDF_Object() {}
     friend class                        CPDF_IndirectObjects;
     friend class                        CPDF_Parser;
     friend class                        CPDF_SyntaxParser;
 private:
     CPDF_Object(const CPDF_Object& src) {}
     CPDF_Object* CloneInternal(FX_BOOL bDirect, CFX_MapPtrToPtr* visited) const;
 };
 class CPDF_Boolean : public CPDF_Object
 {
 public:
 
     static CPDF_Boolean*        Create(FX_BOOL value)
     {
         return FX_NEW CPDF_Boolean(value);
     }
 
-    CPDF_Boolean()
-    {
-        m_Type = PDFOBJ_BOOLEAN;
-    }
-
-    CPDF_Boolean(FX_BOOL value)
-    {
-        m_Type = PDFOBJ_BOOLEAN;
-        m_bValue = value;
-    }
+    CPDF_Boolean() : CPDF_Object(PDFOBJ_BOOLEAN), m_bValue(false) { }
+    CPDF_Boolean(FX_BOOL value) : CPDF_Object(PDFOBJ_BOOLEAN), m_bValue(value) { }
 
     FX_BOOL                                     Identical(CPDF_Boolean* pOther) const
     {
         return m_bValue == pOther->m_bValue;
     }
 protected:
 
     FX_BOOL                                     m_bValue;
     friend class                        CPDF_Object;
 };
@@ skipping 14 matching lines @@
     static CPDF_Number*         Create(FX_BSTR str)
     {
         return FX_NEW CPDF_Number(str);
     }
 
     static CPDF_Number*         Create(FX_BOOL bInteger, void* pData)
     {
         return FX_NEW CPDF_Number(bInteger, pData);
     }
 
-    CPDF_Number(): m_Integer(0) 
-    {
-        m_Type = PDFOBJ_NUMBER;
-    } 
+    CPDF_Number() : CPDF_Object(PDFOBJ_NUMBER), m_bInteger(false), m_Integer(0) { }
 
     CPDF_Number(FX_BOOL bInteger, void* pData);
 
     CPDF_Number(int value);
 
     CPDF_Number(FX_FLOAT value);
 
     CPDF_Number(FX_BSTR str);
 
     FX_BOOL                                     Identical(CPDF_Number* pOther) const;
@@ skipping 47 matching lines @@
     static CPDF_String*         Create(const CFX_ByteString& str, FX_BOOL bHex = FALSE)
     {
         return FX_NEW CPDF_String(str, bHex);
     }
 
     static CPDF_String*         Create(const CFX_WideString& str)
     {
         return FX_NEW CPDF_String(str);
     }
 
-    CPDF_String()
-    {
-        m_Type = PDFOBJ_STRING;
-        m_bHex = FALSE;
-    }
+    CPDF_String() : CPDF_Object(PDFOBJ_STRING), m_bHex(FALSE) { }
 
-    CPDF_String(const CFX_ByteString& str, FX_BOOL bHex = FALSE) : m_String(str)
-    {
-        m_Type = PDFOBJ_STRING;
-        m_bHex = bHex;
+    CPDF_String(const CFX_ByteString& str, FX_BOOL bHex = FALSE)
+        : CPDF_Object(PDFOBJ_STRING), m_String(str), m_bHex(bHex) {
     }
 
     CPDF_String(const CFX_WideString& str);
 
     CFX_ByteString&                     GetString()
     {
         return m_String;
     }
 
     FX_BOOL                                     Identical(CPDF_String* pOther) const
@@ skipping 24 matching lines @@
     static CPDF_Name*           Create(FX_BSTR str)
     {
         return FX_NEW CPDF_Name(str);
     }
 
     static CPDF_Name*           Create(FX_LPCSTR str)
     {
         return FX_NEW CPDF_Name(str);
     }
 
-    CPDF_Name(const CFX_ByteString& str) : m_Name(str)
-    {
-        m_Type = PDFOBJ_NAME;
-    }
-
-    CPDF_Name(FX_BSTR str) : m_Name(str)
-    {
-        m_Type = PDFOBJ_NAME;
-    }
-
-    CPDF_Name(FX_LPCSTR str) : m_Name(str)
-    {
-        m_Type = PDFOBJ_NAME;
-    }
+    CPDF_Name(const CFX_ByteString& str) : CPDF_Object(PDFOBJ_NAME), m_Name(str) { }
+    CPDF_Name(FX_BSTR str) : CPDF_Object(PDFOBJ_NAME), m_Name(str) { }
+    CPDF_Name(FX_LPCSTR str) : CPDF_Object(PDFOBJ_NAME), m_Name(str) { }
 
     CFX_ByteString&                     GetString()
     {
         return m_Name;
     }
 
     FX_BOOL                                     Identical(CPDF_Name* pOther) const
     {
         return m_Name == pOther->m_Name;
     }
 protected:
 
     CFX_ByteString                      m_Name;
     friend class                        CPDF_Object;
 };
 class CPDF_Array : public CPDF_Object
 {
 public:
 
     static CPDF_Array*          Create()
     {
         return FX_NEW CPDF_Array();
     }
 
-    CPDF_Array()
-    {
-        m_Type = PDFOBJ_ARRAY;
-    }
+    CPDF_Array() : CPDF_Object(PDFOBJ_ARRAY) { }
 
     FX_DWORD                            GetCount() const
     {
         return m_Objects.GetSize();
     }
 
     CPDF_Object*                        GetElement(FX_DWORD index) const;
 
     CPDF_Object*                        GetElementValue(FX_DWORD index) const;
 
@@ skipping 76 matching lines @@
 };
 class CPDF_Dictionary : public CPDF_Object
 {
 public:
 
     static CPDF_Dictionary*     Create()
     {
         return FX_NEW CPDF_Dictionary();
     }
 
-    CPDF_Dictionary()
-    {
-        m_Type = PDFOBJ_DICTIONARY;
-    }
-
-
+    CPDF_Dictionary() : CPDF_Object(PDFOBJ_DICTIONARY) { }
 
     CPDF_Object*                        GetElement(FX_BSTR key) const;
 
     CPDF_Object*                        GetElementValue(FX_BSTR key) const;
 
 
 
 
 
     CFX_ByteString                      GetString(FX_BSTR key) const;
@@ skipping 254 matching lines @@
 };
 class CPDF_Null : public CPDF_Object
 {
 public:
 
     static CPDF_Null*           Create()
     {
         return FX_NEW CPDF_Null();
     }
 
-    CPDF_Null()
-    {
-        m_Type = PDFOBJ_NULL;
-    }
+    CPDF_Null() : CPDF_Object(PDFOBJ_NULL) { }
 };
 class CPDF_Reference : public CPDF_Object
 {
 public:
 
     static CPDF_Reference*      Create(CPDF_IndirectObjects* pDoc, int objnum)
     {
         return FX_NEW CPDF_Reference(pDoc, objnum);
     }
 
     CPDF_Reference(CPDF_IndirectObjects* pDoc, int objnum)
-    {
-        m_Type = PDFOBJ_REFERENCE;
-        m_pObjList = pDoc;
-        m_RefObjNum = objnum;
+        : CPDF_Object(PDFOBJ_REFERENCE), m_pObjList(pDoc), m_RefObjNum(objnum) {
     }
 
     CPDF_IndirectObjects*       GetObjList() const
     {
         return m_pObjList;
     }
 
     FX_DWORD                            GetRefObjNum() const
     {
         return m_RefObjNum;
@@ skipping 43 matching lines @@
     }
 protected:
 
     CFX_MapPtrToPtr                     m_IndirectObjs;
 
     IPDF_DocParser*                     m_pParser;
 
     FX_DWORD                            m_LastObjNum;
 };
 #endif