diff options
author | Tom Sepez <tsepez@chromium.org> | 2017-04-24 16:38:51 -0700 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-02 16:27:14 +0000 |
commit | 336544a7451ac80c9f33216b7f61e9347d251108 (patch) | |
tree | 5adad5d8f5aebef14f11b2967c8815f3e7e8c2e6 /fxjs/cfxjse_context.cpp | |
parent | ec3a9e27d9e37ef9074c0097481d4a9dfd57549f (diff) | |
download | pdfium-336544a7451ac80c9f33216b7f61e9347d251108.tar.xz |
Tag FXJSE's V8 objects as such.
There are two APIs to V8 from pdfium: FXJS and FXJSE (for XFA).
Previously, we put tags in internal fields for FXJS's objects.
Now do the same for FXJSE.
Bug: 713998
Change-Id: Ife4f616df3768db566b996dedc1da104f8d3fb93
Reviewed-on: https://pdfium-review.googlesource.com/4475
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs/cfxjse_context.cpp')
-rw-r--r-- | fxjs/cfxjse_context.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/fxjs/cfxjse_context.cpp b/fxjs/cfxjse_context.cpp index 183d6363eb..8696cee42f 100644 --- a/fxjs/cfxjse_context.cpp +++ b/fxjs/cfxjse_context.cpp @@ -41,6 +41,8 @@ const char szCompatibleModeScript[] = " }\n" "}(this, {String: ['substr', 'toUpperCase']}));"; +wchar_t g_FXJSETagString[] = L"FXJSE_HostObject"; + } // namespace // Note, not in the anonymous namespace due to the friend call @@ -79,9 +81,9 @@ v8::Local<v8::Object> FXJSE_GetGlobalObjectFromContext( void FXJSE_UpdateObjectBinding(v8::Local<v8::Object>& hObject, CFXJSE_HostObject* lpNewBinding) { ASSERT(!hObject.IsEmpty()); - ASSERT(hObject->InternalFieldCount() > 0); - hObject->SetAlignedPointerInInternalField(0, - static_cast<void*>(lpNewBinding)); + ASSERT(hObject->InternalFieldCount() == 2); + hObject->SetAlignedPointerInInternalField(0, g_FXJSETagString); + hObject->SetAlignedPointerInInternalField(1, lpNewBinding); } CFXJSE_HostObject* FXJSE_RetrieveObjectBinding( @@ -92,15 +94,17 @@ CFXJSE_HostObject* FXJSE_RetrieveObjectBinding( return nullptr; v8::Local<v8::Object> hObject = hJSObject; - if (hObject->InternalFieldCount() == 0) { + if (hObject->InternalFieldCount() != 2) { v8::Local<v8::Value> hProtoObject = hObject->GetPrototype(); if (hProtoObject.IsEmpty() || !hProtoObject->IsObject()) return nullptr; hObject = hProtoObject.As<v8::Object>(); - if (hObject->InternalFieldCount() == 0) + if (hObject->InternalFieldCount() != 2) return nullptr; } + if (hObject->GetAlignedPointerFromInternalField(0) != g_FXJSETagString) + return nullptr; if (lpClass) { v8::Local<v8::FunctionTemplate> hClass = v8::Local<v8::FunctionTemplate>::New( @@ -109,7 +113,7 @@ CFXJSE_HostObject* FXJSE_RetrieveObjectBinding( return nullptr; } return static_cast<CFXJSE_HostObject*>( - hObject->GetAlignedPointerFromInternalField(0)); + hObject->GetAlignedPointerFromInternalField(1)); } v8::Local<v8::Object> FXJSE_CreateReturnValue(v8::Isolate* pIsolate, @@ -167,7 +171,7 @@ std::unique_ptr<CFXJSE_Context> CFXJSE_Context::Create( hObjectTemplate = hFunctionTemplate->InstanceTemplate(); } else { hObjectTemplate = v8::ObjectTemplate::New(pIsolate); - hObjectTemplate->SetInternalFieldCount(1); + hObjectTemplate->SetInternalFieldCount(2); } hObjectTemplate->Set( v8::Symbol::GetToStringTag(pIsolate), |