diff options
| author | tsepez <tsepez@chromium.org> | 2016-06-01 13:35:28 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-01 13:35:28 -0700 |
| commit | 8abd7a2bbfef51ca6dc8a3462c067e5d2c46200e (patch) | |
| tree | be8c84b695efe5e653d881a6f3194df981e76edb /fpdfsdk/javascript | |
| parent | f6be145f54bf44810974e43e9554c756c9730bb6 (diff) | |
| download | pdfium-8abd7a2bbfef51ca6dc8a3462c067e5d2c46200e.tar.xz | |
Remove use of v8:Lockers
The entire code base is single-threaded, hence the lockers
ought not be required.
Review-Url: https://codereview.chromium.org/2026933002
Diffstat (limited to 'fpdfsdk/javascript')
| -rw-r--r-- | fpdfsdk/javascript/cjs_context.cpp | 3 | ||||
| -rw-r--r-- | fpdfsdk/javascript/cjs_runtime.cpp | 9 | ||||
| -rw-r--r-- | fpdfsdk/javascript/public_methods_embeddertest.cpp | 6 |
3 files changed, 0 insertions, 18 deletions
diff --git a/fpdfsdk/javascript/cjs_context.cpp b/fpdfsdk/javascript/cjs_context.cpp index 66a3e0783d..c8630ab32d 100644 --- a/fpdfsdk/javascript/cjs_context.cpp +++ b/fpdfsdk/javascript/cjs_context.cpp @@ -30,9 +30,6 @@ CPDFDoc_Environment* CJS_Context::GetReaderApp() { FX_BOOL CJS_Context::RunScript(const CFX_WideString& script, CFX_WideString* info) { v8::Isolate::Scope isolate_scope(m_pRuntime->GetIsolate()); -#ifdef PDF_ENABLE_XFA - v8::Locker locker(m_pRuntime->GetIsolate()); -#endif // PDF_ENABLE_XFA v8::HandleScope handle_scope(m_pRuntime->GetIsolate()); v8::Local<v8::Context> context = m_pRuntime->NewJSContext(); v8::Context::Scope context_scope(context); diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp index bcdc17c386..9cbf1b003a 100644 --- a/fpdfsdk/javascript/cjs_runtime.cpp +++ b/fpdfsdk/javascript/cjs_runtime.cpp @@ -88,7 +88,6 @@ CJS_Runtime::CJS_Runtime(CPDFDoc_Environment* pApp) v8::Isolate* isolate = m_isolate; v8::Isolate::Scope isolate_scope(isolate); - v8::Locker locker(isolate); v8::HandleScope handle_scope(isolate); if (CPDFXFA_App::GetInstance()->IsJavaScriptInitialized()) { CJS_Context* pContext = (CJS_Context*)NewContext(); @@ -128,9 +127,6 @@ CJS_Runtime::~CJS_Runtime() { void CJS_Runtime::DefineJSObjects() { v8::Isolate::Scope isolate_scope(GetIsolate()); -#ifdef PDF_ENABLE_XFA - v8::Locker locker(GetIsolate()); -#endif v8::HandleScope handle_scope(GetIsolate()); v8::Local<v8::Context> context = v8::Context::New(GetIsolate()); v8::Context::Scope context_scope(context); @@ -197,9 +193,6 @@ IJS_Context* CJS_Runtime::GetCurrentContext() { void CJS_Runtime::SetReaderDocument(CPDFSDK_Document* pReaderDoc) { if (m_pDocument != pReaderDoc) { v8::Isolate::Scope isolate_scope(m_isolate); -#ifdef PDF_ENABLE_XFA - v8::Locker locker(m_isolate); -#endif v8::HandleScope handle_scope(m_isolate); v8::Local<v8::Context> context = v8::Local<v8::Context>::New(m_isolate, m_context); @@ -265,7 +258,6 @@ FX_BOOL CJS_Runtime::GetValueByName(const CFX_ByteStringC& utf8Name, #ifdef PDF_ENABLE_XFA const FX_CHAR* name = utf8Name.c_str(); - v8::Locker lock(GetIsolate()); v8::Isolate::Scope isolate_scope(GetIsolate()); v8::HandleScope handle_scope(GetIsolate()); v8::Local<v8::Context> old_context = GetIsolate()->GetCurrentContext(); @@ -302,7 +294,6 @@ FX_BOOL CJS_Runtime::SetValueByName(const CFX_ByteStringC& utf8Name, return FALSE; const FX_CHAR* name = utf8Name.c_str(); v8::Isolate* pIsolate = GetIsolate(); - v8::Locker lock(pIsolate); v8::Isolate::Scope isolate_scope(pIsolate); v8::HandleScope handle_scope(pIsolate); v8::Local<v8::Context> context = diff --git a/fpdfsdk/javascript/public_methods_embeddertest.cpp b/fpdfsdk/javascript/public_methods_embeddertest.cpp index 1fc967b890..80ec6492ee 100644 --- a/fpdfsdk/javascript/public_methods_embeddertest.cpp +++ b/fpdfsdk/javascript/public_methods_embeddertest.cpp @@ -21,9 +21,6 @@ class PublicMethodsEmbedderTest : public JSEmbedderTest {}; TEST_F(PublicMethodsEmbedderTest, MakeRegularDate) { v8::Isolate::Scope isolate_scope(isolate()); -#ifdef PDF_ENABLE_XFA - v8::Locker locker(isolate()); -#endif // PDF_ENABLE_XFA v8::HandleScope handle_scope(isolate()); v8::Context::Scope context_scope(GetV8Context()); bool bWrongFormat; @@ -104,9 +101,6 @@ TEST_F(PublicMethodsEmbedderTest, MakeRegularDate) { TEST_F(PublicMethodsEmbedderTest, MakeFormatDate) { v8::Isolate::Scope isolate_scope(isolate()); -#ifdef PDF_ENABLE_XFA - v8::Locker locker(isolate()); -#endif // PDF_ENABLE_XFA v8::HandleScope handle_scope(isolate()); v8::Context::Scope context_scope(GetV8Context()); CFX_WideString formatted_date; |