diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-09-17 15:25:23 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-09-17 15:25:23 -0700 |
| commit | 39bfe122b4867601051c56562a5ab9cf6be644ad (patch) | |
| tree | 73ea2387759b2ba2a80ab344da69dc063fc69172 /fpdfsdk/src/javascript/util.cpp | |
| parent | 4babdcf9c7abc9edefb179e5ed23db8e7a5840f7 (diff) | |
| download | pdfium-39bfe122b4867601051c56562a5ab9cf6be644ad.tar.xz | |
Merge to XFA: Ensure functions in FXJS_V8 are prefixed by FXJS_.
Manual edits:
fpdfsdk/include/javascript/JS_Define.h
fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
fpdfsdk/src/javascript/Document.cpp
fpdfsdk/src/javascript/JS_Runtime.cpp
fpdfsdk/src/jsapi/fxjs_v8.cpp
(cherry picked from commit 506df426d5d64d68e9dc27ffebcf56f6c6a1bccf)
Original Review URL: https://codereview.chromium.org/1347833002 .
(cherry picked from commit 455019ca48f60bd285e043986471f51f17c69a0d)
Original Review URL: https://codereview.chromium.org/1349783003 .
(cherry picked from commit 1af240cc45480520b447be767686e73a29c48f9e)
Original Review URL: https://codereview.chromium.org/1348693003 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1356563003 .
Diffstat (limited to 'fpdfsdk/src/javascript/util.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/util.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpdfsdk/src/javascript/util.cpp b/fpdfsdk/src/javascript/util.cpp index 85092dab17..c1b7b4e06a 100644 --- a/fpdfsdk/src/javascript/util.cpp +++ b/fpdfsdk/src/javascript/util.cpp @@ -212,7 +212,7 @@ FX_BOOL util::printd(IFXJS_Context* cc, return FALSE; } - if (p1.GetType() == VT_number) { + if (p1.GetType() == CJS_Value::VT_number) { int nFormat = p1.ToInt(); CFX_WideString swResult; @@ -242,7 +242,7 @@ FX_BOOL util::printd(IFXJS_Context* cc, vRet = swResult.c_str(); return TRUE; } - if (p1.GetType() == VT_string) { + if (p1.GetType() == CJS_Value::VT_string) { std::basic_string<wchar_t> cFormat = p1.ToCFXWideString().c_str(); bool bXFAPicture = false; |