Merge to XFA: Add type cast definitions for CPDF_Name.

fpdfsdk/src/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 "Document.h"
 
 #include "../../../third_party/base/numerics/safe_math.h"
 #include "../../include/fsdk_mgr.h"  // For CPDFDoc_Environment.
@@ skipping 832 matching lines @@
                          cwCreationDate.c_str());
     FXJS_PutObjectString(isolate, pObj, L"ModDate", cwModDate.c_str());
     FXJS_PutObjectString(isolate, pObj, L"Trapped", cwTrapped.c_str());
 
     // It's to be compatible to non-standard info dictionary.
     FX_POSITION pos = pDictionary->GetStartPos();
     while (pos) {
       CFX_ByteString bsKey;
       CPDF_Object* pValueObj = pDictionary->GetNextElement(pos, bsKey);
       CFX_WideString wsKey = CFX_WideString::FromUTF8(bsKey, bsKey.GetLength());
-      if (pValueObj->IsString() || (pValueObj->GetType() == PDFOBJ_NAME)) {
+
+      if (pValueObj->IsString() || pValueObj->IsName()) {
         FXJS_PutObjectString(isolate, pObj, wsKey.c_str(),
                              pValueObj->GetUnicodeText().c_str());
-      }
-
-      if (pValueObj->IsNumber()) {
+      } else if (pValueObj->IsNumber()) {
         FXJS_PutObjectNumber(isolate, pObj, wsKey.c_str(),
                              (float)pValueObj->GetNumber());
-      }
-
-      if (pValueObj->IsBoolean()) {
+      } else if (pValueObj->IsBoolean()) {
         FXJS_PutObjectBoolean(isolate, pObj, wsKey.c_str(),
                               (bool)pValueObj->GetInteger());
       }
     }
     vp << pObj;
   }
   return TRUE;
 }
 
 FX_BOOL Document::creationDate(IJS_Context* cc,
@@ skipping 960 matching lines @@
   CFX_DWordArray DelArray;
 
   for (int j = DelArray.GetSize() - 1; j >= 0; j--) {
     m_DelayData.RemoveAt(DelArray[j]);
   }
 }
 
 CJS_Document* Document::GetCJSDoc() const {
   return static_cast<CJS_Document*>(m_pJSObject);
 }