diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-09-28 09:44:56 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-09-28 09:44:56 -0700 |
| commit | cfff2f65aaec70247d020188bc68a0dc4fb34c3e (patch) | |
| tree | 2f51d26107008e7b604261974242697effcfce0e /fpdfsdk/src | |
| parent | 6c5afa68ed4e21f9d0bfd1ecc01e824d946c5485 (diff) | |
| download | pdfium-cfff2f65aaec70247d020188bc68a0dc4fb34c3e.tar.xz | |
Introduce kPerIsolateDataIndex and tidy JS_Define.h
Follow-up from https://codereview.chromium.org/1366053003/
- use kPerIsolateDataIndex rather than magic constant 1.
- make a helper function for common code in JS_Define.h
- remove dead prototypes missed in earlier CL.
- fxjs_v8 can't include generic fpdfsdk includes (layering).
R=jochen@chromium.org
Review URL: https://codereview.chromium.org/1367813003 .
Diffstat (limited to 'fpdfsdk/src')
| -rw-r--r-- | fpdfsdk/src/jsapi/fxjs_v8.cpp | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp index d5673e6e87..7b93a2ad26 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp @@ -5,7 +5,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../../core/include/fxcrt/fx_basic.h" -#include "../../include/fsdk_define.h" #include "../../include/jsapi/fxjs_v8.h" const wchar_t kFXJSValueNameString[] = L"string"; @@ -19,6 +18,12 @@ const wchar_t kFXJSValueNameUndefined[] = L"undefined"; static unsigned int g_embedderDataSlot = 1u; +// Keep this consistent with the values defined in gin/public/context_holder.h +// (without actually requiring a dependency on gin itself for the standalone +// embedders of PDFIum). The value we want to use is: +// kPerContextDataStartIndex + kEmbedderPDFium, which is 3. +static const unsigned int kPerContextDataIndex = 3u; + class CFXJS_PrivateData { public: CFXJS_PrivateData(int nObjDefID) : ObjDefID(nObjDefID), pPrivate(NULL) {} @@ -100,6 +105,13 @@ FXJS_PerIsolateData* FXJS_PerIsolateData::Get(v8::Isolate* pIsolate) { pIsolate->GetData(g_embedderDataSlot)); } +void FXJS_Initialize(unsigned int embedderDataSlot) { + g_embedderDataSlot = embedderDataSlot; +} + +void FXJS_Release() { +} + int FXJS_DefineObj(v8::Isolate* pIsolate, const wchar_t* sObjName, FXJSOBJTYPE eObjType, @@ -268,8 +280,7 @@ void FXJS_InitializeRuntime(v8::Isolate* pIsolate, v8::Context::Scope context_scope(v8Context); FXJS_PerIsolateData::SetUp(pIsolate); - v8::Local<v8::External> ptr = v8::External::New(pIsolate, pFXRuntime); - v8Context->SetEmbedderData(1, ptr); + v8Context->SetAlignedPointerInEmbedderData(kPerContextDataIndex, pFXRuntime); int maxID = CFXJS_ObjDefinition::MaxID(pIsolate); for (int i = 0; i < maxID; ++i) { @@ -338,11 +349,10 @@ void FXJS_ReleaseRuntime(v8::Isolate* pIsolate, delete pData; } -void FXJS_Initialize(unsigned int embedderDataSlot) { - g_embedderDataSlot = embedderDataSlot; -} - -void FXJS_Release() { +IFXJS_Runtime* FXJS_GetRuntimeFromIsolate(v8::Isolate* pIsolate) { + v8::Local<v8::Context> context = pIsolate->GetCurrentContext(); + return static_cast<IFXJS_Runtime*>( + context->GetAlignedPointerFromEmbedderData(kPerContextDataIndex)); } int FXJS_Execute(v8::Isolate* pIsolate, |