From d5c4ab1ef458d158e268b5293c231928c59aacb9 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 7 Jun 2018 00:44:25 +0000 Subject: Remove v8::Context slot usage entierly from fxjs Its no longer required. Change-Id: I180ca99817352a91b6d9d7c9b45985cd96dc730e Reviewed-on: https://pdfium-review.googlesource.com/34290 Commit-Queue: dsinclair Reviewed-by: dsinclair --- fxjs/cfxjs_engine.cpp | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'fxjs/cfxjs_engine.cpp') diff --git a/fxjs/cfxjs_engine.cpp b/fxjs/cfxjs_engine.cpp index 5d0f3b0ec5..763a3d9f14 100644 --- a/fxjs/cfxjs_engine.cpp +++ b/fxjs/cfxjs_engine.cpp @@ -15,11 +15,6 @@ class CFXJS_PerObjectData; -// 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; static unsigned int g_embedderDataSlot = 1u; static v8::Isolate* g_isolate = nullptr; static size_t g_isolate_ref_count = 0; @@ -296,18 +291,6 @@ CFXJS_Engine::CFXJS_Engine(v8::Isolate* pIsolate) : CFX_V8(pIsolate) {} CFXJS_Engine::~CFXJS_Engine() = default; -// static -CFXJS_Engine* CFXJS_Engine::EngineFromIsolateCurrentContext( - v8::Isolate* pIsolate) { - return EngineFromContext(pIsolate->GetCurrentContext()); -} - -// static -CFXJS_Engine* CFXJS_Engine::EngineFromContext(v8::Local pContext) { - return static_cast( - pContext->GetAlignedPointerFromEmbedderData(kPerContextDataIndex)); -} - // static int CFXJS_Engine::GetObjDefnID(v8::Local pObj) { CFXJS_PerObjectData* pData = CFXJS_PerObjectData::GetFromObject(pObj); @@ -332,10 +315,6 @@ void CFXJS_Engine::FreeObjectPrivate(v8::Local pObj) { delete pData; } -void CFXJS_Engine::SetIntoContext(v8::Local pContext) { - pContext->SetAlignedPointerInEmbedderData(kPerContextDataIndex, this); -} - int CFXJS_Engine::DefineObj(const char* sObjName, FXJSOBJTYPE eObjType, CFXJS_Engine::Constructor pConstructor, @@ -451,7 +430,6 @@ void CFXJS_Engine::InitializeEngine() { } v8::Context::Scope context_scope(v8Context); - SetIntoContext(v8Context); int maxID = CFXJS_ObjDefinition::MaxID(GetIsolate()); m_StaticObjects.resize(maxID + 1); -- cgit v1.2.3