Fix event handling problem in WorkerContext caused by r10987

webkit/port/bindings/v8/v8_events.cpp

 // Copyright (c) 2008, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 44 matching lines @@
   m_columnNumber = 0;
   if (m_isInline && m_frame->document()->tokenizer()) {
     m_lineNumber = m_frame->document()->tokenizer()->lineNumber();
     m_columnNumber = m_frame->document()->tokenizer()->columnNumber();
   }
 }
 
 
 void V8AbstractEventListener::HandleEventHelper(v8::Handle<v8::Context> context,
                                                 Event* event,
+                                                v8::Handle<v8::Value> jsevent,
                                                 bool isWindowEvent) {
 
-  // Enter the V8 context in which to perform the event handling.
-  v8::Context::Scope scope(context);
-
-  // Get the V8 wrapper for the event object.
-  v8::Handle<v8::Value> jsevent = V8Proxy::EventToV8Object(event);
-
   // For compatibility, we store the event object as a property on the window
   // called "event".  Because this is the global namespace, we save away any
   // existing "event" property, and then restore it after executing the
   // javascript handler.
   v8::Local<v8::String> event_symbol = v8::String::NewSymbol("event");
   v8::Local<v8::Value> saved_evt;
   v8::Local<v8::Value> ret;
 
   {
     // Catch exceptions thrown in the event handler so they do not
@@ skipping 69 matching lines @@
   v8::Handle<v8::Context> context = V8Proxy::GetContext(m_frame);
   if (context.IsEmpty())
     return;
 
   // m_frame can removed by the callback function,
   // protect it until the callback function returns.
   RefPtr<Frame> protector(m_frame);
 
   IF_DEVEL(log_info(frame, "Handling DOM event", m_frame->document()->URL()));
 
-  HandleEventHelper(context, event, isWindowEvent);
+  {
+    // Enter the V8 context in which to perform the event handling.
+    v8::Context::Scope scope(context);
+
+    // Get the V8 wrapper for the event object.
+    v8::Handle<v8::Value> jsevent = V8Proxy::EventToV8Object(event);
+
+    HandleEventHelper(context, event, jsevent, isWindowEvent);
+  }
 
   Document::updateDocumentsRendering();
 }
 
 
 void V8AbstractEventListener::DisposeListenerObject() {
   if (!m_listener.IsEmpty()) {
 #ifndef NDEBUG
     V8Proxy::UnregisterGlobalHandle(this, m_listener);
 #endif
@@ skipping 327 matching lines @@
   // and destroys 'this' object. Keep a local reference of it.
   // See issue 889829
   RefPtr<V8AbstractEventListener> self(this);
 
   v8::HandleScope handle_scope;
 
   v8::Handle<v8::Context> context = m_proxy->GetContext();
   if (context.IsEmpty())
     return;
 
-  HandleEventHelper(context, event, isWindowEvent);
+  {
+    // Enter the V8 context in which to perform the event handling.
+    v8::Context::Scope scope(context);
+    
+    // Get the V8 wrapper for the event object.
+    v8::Handle<v8::Value> jsevent =
+        WorkerContextExecutionProxy::EventToV8Object(event);
+
+    HandleEventHelper(context, event, jsevent, isWindowEvent);
+  }
 }
 
 v8::Local<v8::Value> V8WorkerContextEventListener::CallListenerFunction(
     v8::Handle<v8::Value> jsevent, Event* event, bool isWindowEvent) {
   v8::Local<v8::Function> handler_func = GetListenerFunction();
   if (handler_func.IsEmpty()) return v8::Local<v8::Value>();
 
   v8::Local<v8::Object> receiver = GetReceiverObject(event, isWindowEvent);
   v8::Handle<v8::Value> parameters[1] = {jsevent};
 
@@ skipping 21 matching lines @@
 
   EventTarget* target = event->currentTarget();
   v8::Handle<v8::Value> value =
       WorkerContextExecutionProxy::EventTargetToV8Object(target);
   if (value.IsEmpty()) return v8::Local<v8::Object>();
   return v8::Local<v8::Object>::New(v8::Handle<v8::Object>::Cast(value));
 }
 #endif  // WORKERS
 
 }  // namespace WebCore