Merge to XFA: Make conversion between CPDF_Action and its dictionary explicit.

core/include/fpdfdoc/fpdf_doc.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_DOC_H_
 #define _FPDF_DOC_H_
 #ifndef _FPDF_PARSER_
 #include "../fpdfapi/fpdf_parser.h"
@@ skipping 246 matching lines @@
 };
 
 #define PDFNAMED_NEXTPAGE               1
 #define PDFNAMED_PREVPAGE               2
 #define PDFNAMED_FIRSTPAGE              3
 #define PDFNAMED_LASTPAGE               4
 #define PDFJS_MAXLENGTH                 64
 class CPDF_Action : public CFX_Object
 {
 public:
-
-    CPDF_Action(CPDF_Dictionary* pDict = NULL)
-    {
-        m_pDict = pDict;
-    }
-
-    operator CPDF_Dictionary* () const
-    {
-        return m_pDict;
-    }
-
     enum ActionType {
         Unknown = 0,
         GoTo,
         GoToR,
         GoToE,
         Launch,
         Thread,
         URI,
         Sound,
         Movie,
         Hide,
         Named,
         SubmitForm,
         ResetForm,
         ImportData,
         JavaScript,
         SetOCGState,
         Rendition,
         Trans,
         GoTo3DView
     };
 
+    CPDF_Action() : m_pDict(nullptr) { }
+    explicit CPDF_Action(CPDF_Dictionary* pDict) : m_pDict(pDict) { }
+
+    operator bool () const { return m_pDict != NULL; }
+
+    CPDF_Dictionary* GetDict() const { return m_pDict; }
+
     CFX_ByteString              GetTypeName() const
     {
         return m_pDict->GetString("S");
     }
 
     ActionType                  GetType() const;
 
 
 
     CPDF_Dest                   GetDest(CPDF_Document* pDoc) const;
@@ skipping 105 matching lines @@
         return m_pDict->GetBoolean("Mix");
     }
 
 
 
 
     FX_DWORD                    GetSubActionsCount() const;
 
     CPDF_Action                 GetSubAction(FX_DWORD iIndex) const;
 
-
+protected:
     CPDF_Dictionary*    m_pDict;
 };
 class CPDF_AAction : public CFX_Object
 {
 public:
 
     CPDF_AAction(CPDF_Dictionary* pDict = NULL)
     {
         m_pDict = pDict;
     }
@@ skipping 1333 matching lines @@
     FX_FLOAT                            GetOriginalColor(int index, FX_BSTR csEntry);
 
     void                                        GetOriginalColor(int& iColorType, FX_FLOAT fc[4], FX_BSTR csEntry);
 
     CFX_WideString                      GetCaption(FX_BSTR csEntry);
 
     CPDF_Stream*                        GetIcon(FX_BSTR csEntry);
     friend class                        CPDF_FormControl;
 };
 #endif