Use std::map as CPDF_Dictionary's underlying store.

core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.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 "core/include/fpdfapi/fpdf_parser.h"
 
 #include "core/include/fxcrt/fx_string.h"
 
@@ skipping 240 matching lines @@
       int n = pThis->GetCount();
       for (int i = 0; i < n; i++) {
         CPDF_Object* value = pThis->m_Objects.GetAt(i);
         pCopy->m_Objects.Add(value->CloneInternal(bDirect, visited));
       }
       return pCopy;
     }
     case PDFOBJ_DICTIONARY: {
       CPDF_Dictionary* pCopy = new CPDF_Dictionary();
       const CPDF_Dictionary* pThis = AsDictionary();
-      FX_POSITION pos = pThis->m_Map.GetStartPosition();
-      while (pos) {
-        CFX_ByteString key;
-        CPDF_Object* value;
-        pThis->m_Map.GetNextAssoc(pos, key, (void*&)value);
-        pCopy->m_Map.SetAt(key, value->CloneInternal(bDirect, visited));
+      for (const auto& it : pThis->m_Map) {

[Tom Sepez, 2016/01/05 19:41:56]

nit: (const auto& it : *pThis)  ?

[Oliver Chang, 2016/01/07 16:04:25]

Done.

+        pCopy->m_Map.insert(std::make_pair(
+            it.first, it.second->CloneInternal(bDirect, visited)));
       }
       return pCopy;
     }
     case PDFOBJ_NULL: {
       return new CPDF_Null;
     }
     case PDFOBJ_STREAM: {
       const CPDF_Stream* pThis = AsStream();
       CPDF_StreamAcc acc;
       acc.LoadAllData(pThis, TRUE);
@@ skipping 287 matching lines @@
   if (m_Objects.GetSize() != pOther->m_Objects.GetSize()) {
     return FALSE;
   }
   for (int i = 0; i < m_Objects.GetSize(); i++) {
     if (!m_Objects[i]->IsIdentical(pOther->m_Objects[i]))
       return FALSE;
   }
   return TRUE;
 }
 CPDF_Dictionary::~CPDF_Dictionary() {
-  FX_POSITION pos = m_Map.GetStartPosition();
-  while (pos) {
-    if (CPDF_Object* value = static_cast<CPDF_Object*>(m_Map.GetNextValue(pos)))
-      value->Release();
+  for (const auto& it : m_Map) {
+    it.second->Release();
   }
 }
-FX_POSITION CPDF_Dictionary::GetStartPos() const {
-  return m_Map.GetStartPosition();
-}
-CPDF_Object* CPDF_Dictionary::GetNextElement(FX_POSITION& pos,
-                                             CFX_ByteString& key) const {
-  if (!pos) {
-    return NULL;
-  }
-  CPDF_Object* p;
-  m_Map.GetNextAssoc(pos, key, (void*&)p);
-  return p;
-}
 CPDF_Object* CPDF_Dictionary::GetElement(const CFX_ByteStringC& key) const {
-  CPDF_Object* p = NULL;
-  m_Map.Lookup(key, (void*&)p);
-  return p;
+  auto it = m_Map.find(key);
+  if (it == m_Map.end())
+    return nullptr;
+  return it->second;
 }
 CPDF_Object* CPDF_Dictionary::GetElementValue(
     const CFX_ByteStringC& key) const {
-  CPDF_Object* p = NULL;
-  m_Map.Lookup(key, (void*&)p);
-  return p ? p->GetDirect() : NULL;
+  CPDF_Object* p = GetElement(key);
+  return p ? p->GetDirect() : nullptr;
 }
 CFX_ByteString CPDF_Dictionary::GetString(const CFX_ByteStringC& key) const {
-  CPDF_Object* p = NULL;
-  m_Map.Lookup(key, (void*&)p);
+  CPDF_Object* p = GetElement(key);
   if (p) {
     return p->GetString();
   }
   return CFX_ByteString();
 }
 CFX_ByteStringC CPDF_Dictionary::GetConstString(
     const CFX_ByteStringC& key) const {
-  CPDF_Object* p = NULL;
-  m_Map.Lookup(key, (void*&)p);
+  CPDF_Object* p = GetElement(key);
   if (p) {
     return p->GetConstString();
   }
   return CFX_ByteStringC();
 }
 CFX_WideString CPDF_Dictionary::GetUnicodeText(const CFX_ByteStringC& key,
                                                CFX_CharMap* pCharMap) const {
-  CPDF_Object* p = NULL;
-  m_Map.Lookup(key, (void*&)p);
+  CPDF_Object* p = GetElement(key);
   if (CPDF_Reference* pRef = ToReference(p))
     p = pRef->GetDirect();
   return p ? p->GetUnicodeText(pCharMap) : CFX_WideString();
 }
 CFX_ByteString CPDF_Dictionary::GetString(const CFX_ByteStringC& key,
                                           const CFX_ByteStringC& def) const {
-  CPDF_Object* p = NULL;
-  m_Map.Lookup(key, (void*&)p);
+  CPDF_Object* p = GetElement(key);
   if (p) {
     return p->GetString();
   }
   return CFX_ByteString(def);
 }
 CFX_ByteStringC CPDF_Dictionary::GetConstString(
     const CFX_ByteStringC& key,
     const CFX_ByteStringC& def) const {
-  CPDF_Object* p = NULL;
-  m_Map.Lookup(key, (void*&)p);
+  CPDF_Object* p = GetElement(key);
   if (p) {
     return p->GetConstString();
   }
   return CFX_ByteStringC(def);
 }
 int CPDF_Dictionary::GetInteger(const CFX_ByteStringC& key) const {
-  CPDF_Object* p = NULL;
-  m_Map.Lookup(key, (void*&)p);
+  CPDF_Object* p = GetElement(key);
   if (p) {
     return p->GetInteger();
   }
   return 0;
 }
 int CPDF_Dictionary::GetInteger(const CFX_ByteStringC& key, int def) const {
-  CPDF_Object* p = NULL;
-  m_Map.Lookup(key, (void*&)p);
+  CPDF_Object* p = GetElement(key);
   if (p) {
     return p->GetInteger();
   }
   return def;
 }
 FX_FLOAT CPDF_Dictionary::GetNumber(const CFX_ByteStringC& key) const {
-  CPDF_Object* p = NULL;
-  m_Map.Lookup(key, (void*&)p);
+  CPDF_Object* p = GetElement(key);
   if (p) {
     return p->GetNumber();
   }
   return 0;
 }
 FX_BOOL CPDF_Dictionary::GetBoolean(const CFX_ByteStringC& key,
                                     FX_BOOL bDefault) const {
-  CPDF_Object* p = NULL;
-  m_Map.Lookup(key, (void*&)p);
+  CPDF_Object* p = GetElement(key);
   if (ToBoolean(p))
     return p->GetInteger();
   return bDefault;
 }
 CPDF_Dictionary* CPDF_Dictionary::GetDict(const CFX_ByteStringC& key) const {
   CPDF_Object* p = GetElementValue(key);
   if (!p)
     return nullptr;
   if (CPDF_Dictionary* pDict = p->AsDictionary())
     return pDict;
@@ skipping 15 matching lines @@
   return rect;
 }
 CFX_Matrix CPDF_Dictionary::GetMatrix(const CFX_ByteStringC& key) const {
   CFX_Matrix matrix;
   CPDF_Array* pArray = GetArray(key);
   if (pArray)
     matrix = pArray->GetMatrix();
   return matrix;
 }
 FX_BOOL CPDF_Dictionary::KeyExist(const CFX_ByteStringC& key) const {
-  void* value;
-  return m_Map.Lookup(key, value);
+  return m_Map.find(key) != m_Map.end();
 }
 
 void CPDF_Dictionary::SetAt(const CFX_ByteStringC& key, CPDF_Object* pObj) {
   ASSERT(IsDictionary());
-  void* pValue = nullptr;
-  m_Map.Lookup(key, pValue);
-  CPDF_Object* pExisting = static_cast<CPDF_Object*>(pValue);
-  if (pExisting == pObj)
+  // Avoid 2 constructions of CFX_ByteString.
+  CFX_ByteString key_bytestring = key;
+  auto it = m_Map.find(key_bytestring);
+  if (it == m_Map.end()) {
+    if (pObj) {
+      m_Map.insert(std::make_pair(key_bytestring, pObj));
+    }
     return;
+  }
 
-  if (pExisting)
-    pExisting->Release();
+  if (it->second == pObj)
+    return;
+  it->second->Release();
 
   if (pObj)
-    m_Map.SetAt(key, pObj);
+    it->second = pObj;
   else
-    m_Map.RemoveKey(key);
-}
-
-void CPDF_Dictionary::AddValue(const CFX_ByteStringC& key, CPDF_Object* pObj) {
-  ASSERT(m_Type == PDFOBJ_DICTIONARY);
-  m_Map.AddValue(key, pObj);
+    m_Map.erase(it);
 }
 void CPDF_Dictionary::RemoveAt(const CFX_ByteStringC& key) {
   ASSERT(m_Type == PDFOBJ_DICTIONARY);
-  CPDF_Object* p = NULL;
-  m_Map.Lookup(key, (void*&)p);
-  if (!p) {
+  auto it = m_Map.find(key);
+  if (it == m_Map.end())
     return;
-  }
-  p->Release();
-  m_Map.RemoveKey(key);
+
+  it->second->Release();
+  m_Map.erase(it);
 }
 void CPDF_Dictionary::ReplaceKey(const CFX_ByteStringC& oldkey,
                                  const CFX_ByteStringC& newkey) {
   ASSERT(m_Type == PDFOBJ_DICTIONARY);
-  CPDF_Object* p = NULL;
-  m_Map.Lookup(oldkey, (void*&)p);
-  if (!p) {
+  auto old_it = m_Map.find(oldkey);
+  if (old_it == m_Map.end())
     return;
+
+  // Avoid 2 constructions of CFX_ByteString.
+  CFX_ByteString newkey_bytestring = newkey;
+  auto new_it = m_Map.find(newkey_bytestring);
+  if (new_it != m_Map.end()) {
+    new_it->second->Release();
+    new_it->second = old_it->second;
+  } else {
+    m_Map.insert(std::make_pair(newkey_bytestring, old_it->second));
   }
-  m_Map.RemoveKey(oldkey);
-  m_Map.SetAt(newkey, p);
+  m_Map.erase(old_it);
 }
 FX_BOOL CPDF_Dictionary::Identical(CPDF_Dictionary* pOther) const {
   if (!pOther) {
     return FALSE;
   }
-  if (m_Map.GetCount() != pOther->m_Map.GetCount()) {
+  if (m_Map.size() != pOther->m_Map.size()) {
     return FALSE;
   }
-  FX_POSITION pos = m_Map.GetStartPosition();
-  while (pos) {
-    CFX_ByteString key;
-    void* value;
-    m_Map.GetNextAssoc(pos, key, value);
-    if (!value)
-      return FALSE;
-    if (!static_cast<CPDF_Object*>(value)->IsIdentical(pOther->GetElement(key)))
+  for (const auto& it : m_Map) {
+    const CFX_ByteString& key = it.first;
+    if (!it.second->IsIdentical(pOther->GetElement(key)))
       return FALSE;
   }
   return TRUE;
 }
 void CPDF_Dictionary::SetAtInteger(const CFX_ByteStringC& key, int i) {
   SetAt(key, new CPDF_Number(i));
 }
 void CPDF_Dictionary::SetAtName(const CFX_ByteStringC& key,
                                 const CFX_ByteString& name) {
   SetAt(key, new CPDF_Name(name));
 }
 void CPDF_Dictionary::SetAtString(const CFX_ByteStringC& key,
                                   const CFX_ByteString& str) {
   SetAt(key, new CPDF_String(str, FALSE));
 }
 void CPDF_Dictionary::SetAtReference(const CFX_ByteStringC& key,
                                      CPDF_IndirectObjects* pDoc,
                                      FX_DWORD objnum) {
   SetAt(key, new CPDF_Reference(pDoc, objnum));
 }
 void CPDF_Dictionary::AddReference(const CFX_ByteStringC& key,
                                    CPDF_IndirectObjects* pDoc,
                                    FX_DWORD objnum) {
-  AddValue(key, new CPDF_Reference(pDoc, objnum));
+  SetAt(key, new CPDF_Reference(pDoc, objnum));
 }
 void CPDF_Dictionary::SetAtNumber(const CFX_ByteStringC& key, FX_FLOAT f) {
   CPDF_Number* pNumber = new CPDF_Number;
   pNumber->SetNumber(f);
   SetAt(key, pNumber);
 }
 void CPDF_Dictionary::SetAtBoolean(const CFX_ByteStringC& key, FX_BOOL bValue) {
   SetAt(key, new CPDF_Boolean(bValue));
 }
 void CPDF_Dictionary::SetAtRect(const CFX_ByteStringC& key,
@@ skipping 365 matching lines @@
   }
   pObj->m_ObjNum = objnum;
   m_IndirectObjs.SetAt((void*)(uintptr_t)objnum, pObj);
   if (m_LastObjNum < objnum)
     m_LastObjNum = objnum;
   return TRUE;
 }
 FX_DWORD CPDF_IndirectObjects::GetLastObjNum() const {
   return m_LastObjNum;
 }