Revert of Make Document::m_IconList a vector of IconElements.

fpdfsdk/javascript/Document.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 "fpdfsdk/javascript/Document.h"
 
 #include <utility>
 #include <vector>
@@ skipping 1238 matching lines @@
     sError = JSGetStringFromID(IDS_STRING_JSTYPEERROR);
     return FALSE;
   }
 
   CJS_EmbedObj* pEmbedObj = params[1].ToCJSObject(pRuntime)->GetEmbedObject();
   if (!pEmbedObj) {
     sError = JSGetStringFromID(IDS_STRING_JSTYPEERROR);
     return FALSE;
   }
 
-  m_Icons.push_back(IconElement(swIconName, static_cast<Icon*>(pEmbedObj)));
+  m_IconList.push_back(std::unique_ptr<IconElement>(
+      new IconElement(swIconName, (Icon*)pEmbedObj)));
   return TRUE;
 }
 
 FX_BOOL Document::icons(IJS_Context* cc,
                         CJS_PropValue& vp,
                         CFX_WideString& sError) {
   if (vp.IsSetting()) {
     sError = JSGetStringFromID(IDS_STRING_JSREADONLY);
     return FALSE;
   }
 
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
-  if (m_Icons.empty()) {
+  if (m_IconList.empty()) {
     vp.GetJSValue()->SetNull(pRuntime);
     return TRUE;
   }
 
   CJS_Array Icons;
 
   int i = 0;
-  for (const auto& element : m_Icons) {
+  for (const auto& pIconElement : m_IconList) {
     v8::Local<v8::Object> pObj =
         pRuntime->NewFxDynamicObj(CJS_Icon::g_nObjDefnID);
     if (pObj.IsEmpty())
       return FALSE;
 
     CJS_Icon* pJS_Icon =
         static_cast<CJS_Icon*>(pRuntime->GetObjectPrivate(pObj));
     if (!pJS_Icon)
       return FALSE;
 
-    Icon* pIcon = static_cast<Icon*>(pJS_Icon->GetEmbedObject());
+    Icon* pIcon = (Icon*)pJS_Icon->GetEmbedObject();
     if (!pIcon)
       return FALSE;
 
-    pIcon->SetStream(element.IconStream->GetStream());
-    pIcon->SetIconName(element.IconName);
+    pIcon->SetStream(pIconElement->IconStream->GetStream());
+    pIcon->SetIconName(pIconElement->IconName);
     Icons.SetElement(pRuntime, i++, CJS_Value(pRuntime, pJS_Icon));
   }
 
   vp << Icons;
   return TRUE;
 }
 
 FX_BOOL Document::getIcon(IJS_Context* cc,
                           const std::vector<CJS_Value>& params,
                           CJS_Value& vRet,
                           CFX_WideString& sError) {
   if (params.size() != 1) {
     sError = JSGetStringFromID(IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
-  if (m_Icons.empty())
+  if (m_IconList.empty())
     return FALSE;
 
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
   CFX_WideString swIconName = params[0].ToCFXWideString(pRuntime);
 
-  for (const auto& element : m_Icons) {
-    if (element.IconName != swIconName)
-      continue;
+  for (const auto& pIconElement : m_IconList) {
+    if (pIconElement->IconName == swIconName) {
+      Icon* pRetIcon = pIconElement->IconStream;
 
-    v8::Local<v8::Object> pObj =
-        pRuntime->NewFxDynamicObj(CJS_Icon::g_nObjDefnID);
-    if (pObj.IsEmpty())
-      return FALSE;
+      v8::Local<v8::Object> pObj =
+          pRuntime->NewFxDynamicObj(CJS_Icon::g_nObjDefnID);
+      if (pObj.IsEmpty())
+        return FALSE;
 
-    CJS_Icon* pJS_Icon =
-        static_cast<CJS_Icon*>(pRuntime->GetObjectPrivate(pObj));
-    if (!pJS_Icon)
-      return FALSE;
+      CJS_Icon* pJS_Icon =
+          static_cast<CJS_Icon*>(pRuntime->GetObjectPrivate(pObj));
+      if (!pJS_Icon)
+        return FALSE;
 
-    Icon* pIcon = static_cast<Icon*>(pJS_Icon->GetEmbedObject());
-    if (!pIcon)
-      return FALSE;
+      Icon* pIcon = (Icon*)pJS_Icon->GetEmbedObject();
+      if (!pIcon)
+        return FALSE;
 
-    pIcon->SetIconName(swIconName);
-    pIcon->SetStream(element.IconStream->GetStream());
-    vRet = CJS_Value(pRuntime, pJS_Icon);
-    return TRUE;
+      pIcon->SetIconName(swIconName);
+      pIcon->SetStream(pRetIcon->GetStream());
+      vRet = CJS_Value(pRuntime, pJS_Icon);
+      return TRUE;
+    }
   }
 
   return FALSE;
 }
 
 FX_BOOL Document::removeIcon(IJS_Context* cc,
                              const std::vector<CJS_Value>& params,
                              CJS_Value& vRet,
                              CFX_WideString& sError) {
   // Unsafe, no supported.
@@ skipping 362 matching lines @@
     }
   }
 
   for (const auto& pData : DelayDataForFieldAndControlIndex)
     Field::DoDelay(m_pFormFillEnv.Get(), pData.get());
 }
 
 CJS_Document* Document::GetCJSDoc() const {
   return static_cast<CJS_Document*>(m_pJSObject);
 }