Browser Plugin: Fix Events

content/renderer/browser_plugin/browser_plugin.cc

Index: content/renderer/browser_plugin/browser_plugin.cc
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index ed0f293678b2d13a4c5398ce6640fec90470115a..054564951f7cc14ee493c570c2dce45fc0ecef77 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -324,16 +324,17 @@ void BrowserPlugin::GuestCrashed() {
   if (!HasListeners(kCrashEventName))
     return;
 
-  EventListeners& listeners = event_listener_map_[kCrashEventName];
+  WebKit::WebElement plugin = container()->element();

[Charlie Reis, 2012/10/10 00:05:09]

nit: It looks like you never use plugin directly, just
plugin.document().frame().  Why not grab it up front?  And is a null check
needed here as well?

+  v8::HandleScope handle_scope;
+  v8::Context::Scope context_scope(
+      plugin.document().frame()->mainWorldScriptContext());
+
+  EventListeners listeners(event_listener_map_[kCrashEventName]);
   EventListeners::iterator it = listeners.begin();
   for (; it != listeners.end(); ++it) {
-    v8::Context::Scope context_scope(v8::Context::New());
-    v8::HandleScope handle_scope;
-    container()->element().document().frame()->
-        callFunctionEvenIfScriptDisabled(*it,
-                                         v8::Object::New(),
-                                         0,
-                                         NULL);
+    WebKit::WebFrame* frame = plugin.document().frame();
+    if (frame)

[Charlie Reis, 2012/10/10 00:05:09]

If this null check is to guard against frame being deleted, then it won't help,
will it?  The pointer doesn't get nulled when frame is deleted; it's just
garbage or some other object the next time around.

As Adam mentioned, it's probably a larger design issue to ensure the plugin
isn't deleted by one of these listeners.  A TODO with a new bug number would
help us keep track of that.

[Charlie Reis, 2012/10/10 02:46:13]

Ok, I missed the fact that document()'s reference to the Frame would be nulled
out.

So, LGTM if you add a TODO for the plugin deletion issue.

+      frame->callFunctionEvenIfScriptDisabled(*it, v8::Object::New(), 0, NULL);
   }
 }
 
@@ -343,18 +344,21 @@ void BrowserPlugin::DidNavigate(const GURL& url, int process_id) {
   if (!HasListeners(kNavigationEventName))
     return;
 
-  EventListeners& listeners = event_listener_map_[kNavigationEventName];
+  WebKit::WebElement plugin = container()->element();
+  v8::HandleScope handle_scope;
+  v8::Context::Scope context_scope(
+      plugin.document().frame()->mainWorldScriptContext());
+
+  v8::Local<v8::Value> param = v8::String::New(src_.data(), src_.size());
+
+  EventListeners listeners(event_listener_map_[kNavigationEventName]);
   EventListeners::iterator it = listeners.begin();
   for (; it != listeners.end(); ++it) {
-    v8::Context::Scope context_scope(v8::Context::New());
-    v8::HandleScope handle_scope;
-    v8::Local<v8::Value> param =
-        v8::Local<v8::Value>::New(v8::String::New(src_.c_str()));
-    container()->element().document().frame()->
-        callFunctionEvenIfScriptDisabled(*it,
-                                         v8::Object::New(),
-                                         1,
-                                         &param);
+    WebKit::WebFrame* frame = plugin.document().frame();
+    if (frame) {
+      frame->callFunctionEvenIfScriptDisabled(
+          *it, v8::Object::New(), 1, &param);
+    }
   }
 }
 
@@ -362,27 +366,25 @@ void BrowserPlugin::LoadStart(const GURL& url, bool is_top_level) {
   if (!HasListeners(kLoadStartEventName))
     return;
 
-  EventListeners& listeners = event_listener_map_[kLoadStartEventName];
-  EventListeners::iterator it = listeners.begin();
-
-  v8::Context::Scope context_scope(v8::Context::New());
+  WebKit::WebElement plugin = container()->element();
   v8::HandleScope handle_scope;
+  v8::Context::Scope context_scope(
+      plugin.document().frame()->mainWorldScriptContext());
+
   // Construct the loadStart event object.
-  v8::Local<v8::Value> event =
-      v8::Local<v8::Object>::New(v8::Object::New());
-  v8::Local<v8::Object>::Cast(event)->Set(
-      v8::String::New(kURL, sizeof(kURL) - 1),
-      v8::String::New(url.spec().c_str(), url.spec().size()));
-  v8::Local<v8::Object>::Cast(event)->Set(
-      v8::String::New(kIsTopLevel, sizeof(kIsTopLevel) - 1),
-      v8::Boolean::New(is_top_level));
+  v8::Local<v8::Object> event = v8::Object::New();
+  event->Set(v8::String::New(kURL, sizeof(kURL) - 1),
+             v8::String::New(url.spec().data(), url.spec().size()));
+  event->Set(v8::String::New(kIsTopLevel, sizeof(kIsTopLevel) - 1),
+             v8::Boolean::New(is_top_level));
+  v8::Local<v8::Value> val = event;
+
+  EventListeners listeners(event_listener_map_[kLoadStartEventName]);
+  EventListeners::iterator it = listeners.begin();
   for (; it != listeners.end(); ++it) {
-    // Fire the event listener.
-    container()->element().document().frame()->
-        callFunctionEvenIfScriptDisabled(*it,
-                                         v8::Object::New(),
-                                         1,
-                                         &event);
+    WebKit::WebFrame* frame = plugin.document().frame();
+    if (frame)
+      frame->callFunctionEvenIfScriptDisabled(*it, v8::Object::New(), 1, &val);
   }
 }
 
@@ -392,30 +394,27 @@ void BrowserPlugin::LoadAbort(const GURL& url,
   if (!HasListeners(kLoadAbortEventName))
     return;
 
-  EventListeners& listeners = event_listener_map_[kLoadAbortEventName];
-  EventListeners::iterator it = listeners.begin();
-
-  v8::Context::Scope context_scope(v8::Context::New());
+  WebKit::WebElement plugin = container()->element();
   v8::HandleScope handle_scope;
+  v8::Context::Scope context_scope(
+      plugin.document().frame()->mainWorldScriptContext());
+
   // Construct the loadAbort event object.
-  v8::Local<v8::Value> event =
-      v8::Local<v8::Object>::New(v8::Object::New());
-  v8::Local<v8::Object>::Cast(event)->Set(
-      v8::String::New(kURL, sizeof(kURL) - 1),
-      v8::String::New(url.spec().c_str(), url.spec().size()));
-  v8::Local<v8::Object>::Cast(event)->Set(
-      v8::String::New(kIsTopLevel, sizeof(kIsTopLevel) - 1),
-      v8::Boolean::New(is_top_level));
-  v8::Local<v8::Object>::Cast(event)->Set(
-      v8::String::New(kType, sizeof(kType) - 1),
-      v8::String::New(type.c_str(), type.size()));
+  v8::Local<v8::Object> event = v8::Object::New();
+  event->Set(v8::String::New(kURL, sizeof(kURL) - 1),
+             v8::String::New(url.spec().data(), url.spec().size()));
+  event->Set(v8::String::New(kIsTopLevel, sizeof(kIsTopLevel) - 1),
+             v8::Boolean::New(is_top_level));
+  event->Set(v8::String::New(kType, sizeof(kType) - 1),
+             v8::String::New(type.data(), type.size()));
+  v8::Local<v8::Value> val = event;
+
+  EventListeners listeners(event_listener_map_[kLoadAbortEventName]);
+  EventListeners::iterator it = listeners.begin();
   for (; it != listeners.end(); ++it) {
-    // Fire the event listener.
-    container()->element().document().frame()->
-        callFunctionEvenIfScriptDisabled(*it,
-                                         v8::Object::New(),
-                                         1,
-                                         &event);
+    WebKit::WebFrame* frame = plugin.document().frame();
+    if (frame)
+      frame->callFunctionEvenIfScriptDisabled(*it, v8::Object::New(), 1, &val);
   }
 }
 
@@ -425,31 +424,27 @@ void BrowserPlugin::LoadRedirect(const GURL& old_url,
   if (!HasListeners(kLoadRedirectEventName))
     return;
 
-  EventListeners& listeners = event_listener_map_[kLoadRedirectEventName];
-  EventListeners::iterator it = listeners.begin();
-
-  v8::Context::Scope context_scope(v8::Context::New());
+  WebKit::WebElement plugin = container()->element();
   v8::HandleScope handle_scope;
+  v8::Context::Scope context_scope(
+      plugin.document().frame()->mainWorldScriptContext());
 
   // Construct the loadRedirect event object.
-  v8::Local<v8::Value> event =
-      v8::Local<v8::Object>::New(v8::Object::New());
-  v8::Local<v8::Object>::Cast(event)->Set(
-      v8::String::New(kOldURL, sizeof(kOldURL) - 1),
-      v8::String::New(old_url.spec().c_str(), old_url.spec().size()));
-  v8::Local<v8::Object>::Cast(event)->Set(
-      v8::String::New(kNewURL, sizeof(kNewURL) - 1),
-      v8::String::New(new_url.spec().c_str(), new_url.spec().size()));
-  v8::Local<v8::Object>::Cast(event)->Set(
-      v8::String::New(kIsTopLevel, sizeof(kIsTopLevel) - 1),
-      v8::Boolean::New(is_top_level));
+  v8::Local<v8::Object> event = v8::Object::New();
+  event->Set(v8::String::New(kOldURL, sizeof(kOldURL) - 1),
+             v8::String::New(old_url.spec().data(), old_url.spec().size()));
+  event->Set(v8::String::New(kNewURL, sizeof(kNewURL) - 1),
+             v8::String::New(new_url.spec().data(), new_url.spec().size()));
+  event->Set(v8::String::New(kIsTopLevel, sizeof(kIsTopLevel) - 1),
+             v8::Boolean::New(is_top_level));
+  v8::Local<v8::Value> val = event;
+
+  EventListeners listeners(event_listener_map_[kLoadRedirectEventName]);
+  EventListeners::iterator it = listeners.begin();
   for (; it != listeners.end(); ++it) {
-    // Fire the event listener.
-    container()->element().document().frame()->
-        callFunctionEvenIfScriptDisabled(*it,
-                                         v8::Object::New(),
-                                         1,
-                                         &event);
+    WebKit::WebFrame* frame = plugin.document().frame();
+    if (frame)
+      frame->callFunctionEvenIfScriptDisabled(*it, v8::Object::New(), 1, &val);
   }
 }