| commit | 39bfe122b4867601051c56562a5ab9cf6be644ad | [log] [tgz] |
|---|---|---|
| author | Tom Sepez <tsepez@chromium.org> | Thu Sep 17 15:25:23 2015 -0700 |
| committer | Tom Sepez <tsepez@chromium.org> | Thu Sep 17 15:25:23 2015 -0700 |
| tree | 73ea2387759b2ba2a80ab344da69dc063fc69172 | |
| parent | 4babdcf9c7abc9edefb179e5ed23db8e7a5840f7 [diff] [blame] |
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 .
diff --git a/fpdfsdk/include/javascript/JS_Runtime.h b/fpdfsdk/include/javascript/JS_Runtime.h index f0285b2..b53e50e 100644 --- a/fpdfsdk/include/javascript/JS_Runtime.h +++ b/fpdfsdk/include/javascript/JS_Runtime.h
@@ -64,7 +64,7 @@ CJS_FieldEvent* m_pFieldEventPath; v8::Isolate* m_isolate; bool m_isolateManaged; - nonstd::unique_ptr<JS_ArrayBufferAllocator> m_pArrayBufferAllocator; + nonstd::unique_ptr<FXJS_ArrayBufferAllocator> m_pArrayBufferAllocator; v8::Global<v8::Context> m_context; };