summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp2
-rw-r--r--webkit/port/bindings/v8/v8_events.cpp1
2 files changed, 3 insertions, 0 deletions
diff --git a/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp b/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
index fd0c160..06ff389 100644
--- a/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
+++ b/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
@@ -84,6 +84,7 @@ void WorkerContextExecutionProxy::Dispose() {
// the worker context object is going to be disposed immediately when a
// worker thread is tearing down. We do not want to re-delete the real object
// when JS object is garbage collected.
+ v8::Locker locker;
v8::HandleScope scope;
v8::Persistent<v8::Object> wrapper = GetDOMObjectMap().get(m_workerContext);
if (!wrapper.IsEmpty())
@@ -279,6 +280,7 @@ bool WorkerContextExecutionProxy::ForgetV8EventObject(Event* event) {
v8::Local<v8::Value> WorkerContextExecutionProxy::Evaluate(
const String& str, const String& file_name, int base_line) {
+ v8::Locker locker;
v8::HandleScope hs;
InitContextIfNeeded();
diff --git a/webkit/port/bindings/v8/v8_events.cpp b/webkit/port/bindings/v8/v8_events.cpp
index 9f84d9b..0cebb57 100644
--- a/webkit/port/bindings/v8/v8_events.cpp
+++ b/webkit/port/bindings/v8/v8_events.cpp
@@ -504,6 +504,7 @@ void V8WorkerContextEventListener::handleEvent(Event* event,
// See issue 889829
RefPtr<V8AbstractEventListener> self(this);
+ v8::Locker locker;
v8::HandleScope handle_scope;
v8::Handle<v8::Context> context = m_proxy->GetContext();