commit 40e0a819100b6b2cf63070c1a91393cf42820c69
author Tom Sepez <tsepez@chromium.org> Thu Feb 23 13:07:36 2017 -0800
committer Chromium commit bot <commit-bot@chromium.org> Thu Feb 23 22:29:03 2017 +0000
tree 6d5bfd7359378fcacacc51f28ee1d0f8bd6d6804
parent 90b7326a13555795d7292268e83ae4933fd038f5

Remove unused Icon::m_pIconStream

It is set, and passed around, but never operated upon.  This
removes another unowned ptr from JS back to C++ objects.

Change-Id: I2a7eede050c6d844924e3c74395e7672ebb0213e
Reviewed-on: https://pdfium-review.googlesource.com/2829
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>

fpdfsdk/javascript/Field.cpp

diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp
index 477b472..92b473b 100644
--- a/fpdfsdk/javascript/Field.cpp
+++ b/fpdfsdk/javascript/Field.cpp
@@ -2815,10 +2815,11 @@
                           const std::vector<CJS_Value>& params,
                           CJS_Value& vRet,
                           CFX_WideString& sError) {
-  int nface = 0;
-  int iSize = params.size();
-  if (iSize >= 1)
-    nface = params[0].ToInt(pRuntime);
+  if (params.size() >= 1) {
+    int nFace = params[0].ToInt(pRuntime);
+    if (nFace < 0 || nFace > 2)
+      return false;
+  }
 
   std::vector<CPDF_FormField*> FieldArray = GetFormFields(m_FieldName);
   if (FieldArray.empty())
@@ -2837,19 +2838,6 @@
   ASSERT(pObj.IsEmpty() == false);
 
   CJS_Icon* pJS_Icon = static_cast<CJS_Icon*>(pRuntime->GetObjectPrivate(pObj));
-  Icon* pIcon = (Icon*)pJS_Icon->GetEmbedObject();
-
-  CPDF_Stream* pIconStream = nullptr;
-  if (nface == 0)
-    pIconStream = pFormControl->GetNormalIcon();
-  else if (nface == 1)
-    pIconStream = pFormControl->GetDownIcon();
-  else if (nface == 2)
-    pIconStream = pFormControl->GetRolloverIcon();
-  else
-    return false;
-
-  pIcon->SetStream(pIconStream);
   vRet = CJS_Value(pRuntime, pJS_Icon);
   return true;
 }