diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-10-13 12:07:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-13 12:07:42 -0700 |
| commit | f3736bca5f874b0889c5906ffbd74a405089f671 (patch) | |
| tree | ef3a3731f4dfd6b5e3e7f957b1d8e1b61a1a1804 /fxjs | |
| parent | 271d9c0a85b50208baa8789ba6b245956317f719 (diff) | |
| download | pdfium-f3736bca5f874b0889c5906ffbd74a405089f671.tar.xz | |
Reland: Make the CPDFXFA_App non-global
This reverts commit b685e6471075bebd26711bc183de3128f54932e3.
This CL changes CPDFXFA_App from a global object to a child of the CPDFXFA_Document objects.
BUG=pdfium:623
Review-Url: https://codereview.chromium.org/2418653003
Diffstat (limited to 'fxjs')
| -rw-r--r-- | fxjs/fxjs_v8.cpp | 8 | ||||
| -rw-r--r-- | fxjs/fxjs_v8.h | 7 |
2 files changed, 0 insertions, 15 deletions
diff --git a/fxjs/fxjs_v8.cpp b/fxjs/fxjs_v8.cpp index d74d355dc9..5ce8c47569 100644 --- a/fxjs/fxjs_v8.cpp +++ b/fxjs/fxjs_v8.cpp @@ -233,14 +233,6 @@ CFXJS_Engine* CFXJS_Engine::CurrentEngineFromIsolate(v8::Isolate* pIsolate) { kPerContextDataIndex)); } -#ifdef PDF_ENABLE_XFA -// static -void CFXJS_Engine::SetForV8Context(v8::Local<v8::Context> v8Context, - CFXJS_Engine* pEngine) { - v8Context->SetAlignedPointerInEmbedderData(kPerContextDataIndex, pEngine); -} -#endif // PDF_ENABLE_XFA - // static int CFXJS_Engine::GetObjDefnID(v8::Local<v8::Object> pObj) { if (pObj.IsEmpty() || !pObj->InternalFieldCount()) diff --git a/fxjs/fxjs_v8.h b/fxjs/fxjs_v8.h index 5f658989a5..ba729626f2 100644 --- a/fxjs/fxjs_v8.h +++ b/fxjs/fxjs_v8.h @@ -139,13 +139,6 @@ class CFXJS_Engine { static CFXJS_Engine* CurrentEngineFromIsolate(v8::Isolate* pIsolate); static int GetObjDefnID(v8::Local<v8::Object> pObj); -#ifdef PDF_ENABLE_XFA - // Called as part of FXJS_InitializeEngine, exposed so PDF can make its - // own contexts compatible with XFA or vice versa. - static void SetForV8Context(v8::Local<v8::Context> v8Context, - CFXJS_Engine* pEngine); -#endif // PDF_ENABLE_XFA - v8::Isolate* GetIsolate() const { return m_isolate; } // Always returns a valid, newly-created objDefnID. |