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/Consts.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/Consts.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/Consts.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fpdfsdk/src/javascript/Consts.cpp b/fpdfsdk/src/javascript/Consts.cpp index 9574c44730..acb49662b0 100644 --- a/fpdfsdk/src/javascript/Consts.cpp +++ b/fpdfsdk/src/javascript/Consts.cpp @@ -132,7 +132,8 @@ IMPLEMENT_JS_CLASS_CONST(CJS_Zoomtype, zoomtype) static void DefineGlobalConstString(v8::Isolate* pIsolate, const wchar_t* pConstName, const wchar_t* pValue) { - JS_DefineGlobalConst(pIsolate, pConstName, JS_NewString(pIsolate, pValue)); + FXJS_DefineGlobalConst(pIsolate, pConstName, + FXJS_NewString(pIsolate, pValue)); } void CJS_GlobalConsts::DefineJSObjects(v8::Isolate* pIsolate) { @@ -176,7 +177,7 @@ void DefineGlobalConstStringArray(v8::Isolate* pIsolate, } CJS_PropValue prop(pIsolate); prop << array; - JS_DefineGlobalConst(pIsolate, sConstName, prop.ToV8Value()); + FXJS_DefineGlobalConst(pIsolate, sConstName, prop.ToV8Value()); } void CJS_GlobalArrays::DefineJSObjects(v8::Isolate* pIsolate) { |