Chromium Code Reviews| Index: fpdfsdk/src/javascript/Document.cpp |
| diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp |
| index 163323ad25a8e3a8bc1c4d81057eab2c905ef8b0..21f68c9b42b6e31ae4eb91047fb6ece8868adf71 100644 |
| --- a/fpdfsdk/src/javascript/Document.cpp |
| +++ b/fpdfsdk/src/javascript/Document.cpp |
| @@ -848,14 +848,16 @@ FX_BOOL Document::info(IJS_Context* cc, |
| CFX_ByteString bsKey; |
| CPDF_Object* pValueObj = pDictionary->GetNextElement(pos, bsKey); |
| CFX_WideString wsKey = CFX_WideString::FromUTF8(bsKey, bsKey.GetLength()); |
| - if ((pValueObj->GetType() == PDFOBJ_STRING) || |
| - (pValueObj->GetType() == PDFOBJ_NAME)) |
| + if (pValueObj->IsString() || (pValueObj->GetType() == PDFOBJ_NAME)) { |
| FXJS_PutObjectString(isolate, pObj, wsKey.c_str(), |
| pValueObj->GetUnicodeText().c_str()); |
| + } |
| + |
| if (pValueObj->IsNumber()) { |
|
Tom Sepez
2015/10/21 17:12:50
nit: probably else if since it can't be both a num
dsinclair
2015/10/21 17:40:01
Done.
|
| FXJS_PutObjectNumber(isolate, pObj, wsKey.c_str(), |
| (float)pValueObj->GetNumber()); |
| } |
| + |
| if (pValueObj->IsBoolean()) { |
| FXJS_PutObjectBoolean(isolate, pObj, wsKey.c_str(), |
| (bool)pValueObj->GetInteger()); |