Remove implicit conversions and some cleanup

core/src/fpdfdoc/doc_bookmark.cpp

 // 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
 
 #include <memory>
 #include <vector>
 
 #include "core/include/fpdfdoc/fpdf_doc.h"
 
 CPDF_Bookmark CPDF_BookmarkTree::GetFirstChild(
     const CPDF_Bookmark& parent) const {
-  if (!parent.m_pDict) {
+  if (!parent.GetDict()) {
     CPDF_Dictionary* pRoot = m_pDocument->GetRoot()->GetDictBy("Outlines");
-    if (!pRoot) {
+    if (!pRoot)
       return CPDF_Bookmark();
-    }
     return CPDF_Bookmark(pRoot->GetDictBy("First"));
   }
-  return CPDF_Bookmark(parent.m_pDict->GetDictBy("First"));
+  return CPDF_Bookmark(parent.GetDict()->GetDictBy("First"));
 }
+
 CPDF_Bookmark CPDF_BookmarkTree::GetNextSibling(
     const CPDF_Bookmark& bookmark) const {
-  if (!bookmark.m_pDict) {
+  if (!bookmark.GetDict())
     return CPDF_Bookmark();
-  }
-  CPDF_Dictionary* pNext = bookmark.m_pDict->GetDictBy("Next");
-  return pNext == bookmark.m_pDict ? CPDF_Bookmark() : CPDF_Bookmark(pNext);
+
+  CPDF_Dictionary* pNext = bookmark.GetDict()->GetDictBy("Next");
+  return pNext == bookmark.GetDict() ? CPDF_Bookmark() : CPDF_Bookmark(pNext);
 }
+
 FX_DWORD CPDF_Bookmark::GetColorRef() const {
   if (!m_pDict) {
     return 0;
   }
   CPDF_Array* pColor = m_pDict->GetArrayBy("C");
   if (!pColor) {
     return FXSYS_RGB(0, 0, 0);
   }
   int r = FXSYS_round(pColor->GetNumberAt(0) * 255);
   int g = FXSYS_round(pColor->GetNumberAt(1) * 255);
@@ skipping 41 matching lines @@
   if (CPDF_Array* pArray = pDest->AsArray())
     return CPDF_Dest(pArray);
   return CPDF_Dest();
 }
 CPDF_Action CPDF_Bookmark::GetAction() const {
   if (!m_pDict) {
     return CPDF_Action();
   }
   return CPDF_Action(m_pDict->GetDictBy("A"));
 }