Add loadCommit and loadStop Event

content/renderer/browser_plugin/browser_plugin.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/browser_plugin/browser_plugin.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #if defined (OS_WIN)
 #include "base/sys_info.h"
@@ skipping 27 matching lines @@
 using WebKit::WebRect;
 using WebKit::WebURL;
 using WebKit::WebVector;
 
 namespace content {
 
 namespace {
 const char kCrashEventName[] = "crash";
 const char kIsTopLevel[] = "isTopLevel";
 const char kLoadAbortEventName[] = "loadAbort";
+const char kLoadCommitEventName[] = "loadCommit";
 const char kLoadRedirectEventName[] = "loadRedirect";
 const char kLoadStartEventName[] = "loadStart";
-const char kNavigationEventName[] = "navigation";
+const char kLoadStopEventName[] = "loadStop";
 const char kNewURL[] = "newUrl";
 const char kOldURL[] = "oldUrl";
 const char kPartitionAttribute[] = "partition";
 const char kPersistPrefix[] = "persist:";
 const char kSrcAttribute[] = "src";
 const char kType[] = "type";
 const char kURL[] = "url";
 }
 
 BrowserPlugin::BrowserPlugin(
@@ skipping 277 matching lines @@
   // called. See http://crbug.com/155044.
   EventListeners listeners(event_listener_map_[kCrashEventName]);
   EventListeners::iterator it = listeners.begin();
   for (; it != listeners.end(); ++it) {
     WebKit::WebFrame* frame = plugin.document().frame();
     if (frame)
       frame->callFunctionEvenIfScriptDisabled(*it, v8::Object::New(), 0, NULL);
   }
 }
 
-void BrowserPlugin::DidNavigate(
-    const BrowserPluginMsg_DidNavigate_Params& params) {
-  // If the guest has just committed a new navigation then it is no longer
-  // crashed.
-  guest_crashed_ = false;

[Charlie Reis, 2012/10/16 21:17:55]

Please keep these three lines at the start of LoadCommit.

[irobert, 2012/10/17 20:12:37]

Done.

+void BrowserPlugin::LoadStart(const GURL& url, bool is_top_level) {
+  if (!HasListeners(kLoadStartEventName))
+    return;
+
+  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::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;
+
+  // TODO(fsamuel): Copying the event listeners is insufficent because
+  // new persistent handles are not created when the copy constructor is
+  // called. See http://crbug.com/155044.
+  EventListeners listeners(event_listener_map_[kLoadStartEventName]);
+  EventListeners::iterator it = listeners.begin();
+  for (; it != listeners.end(); ++it) {
+    WebKit::WebFrame* frame = plugin.document().frame();
+    if (frame)
+      frame->callFunctionEvenIfScriptDisabled(*it, v8::Object::New(), 1, &val);
+  }
+}
+
+void BrowserPlugin::LoadCommit(
+    const BrowserPluginMsg_LoadCommit_Params& params) {
   src_ = params.url.spec();
   process_id_ = params.process_id;
   current_nav_entry_index_ = params.current_entry_index;
   nav_entry_count_ = params.entry_count;
 
-  if (!HasListeners(kNavigationEventName))
+  if (!HasListeners(kLoadCommitEventName))
     return;
 
   WebKit::WebElement plugin = container()->element();
   v8::HandleScope handle_scope;
   v8::Context::Scope context_scope(
       plugin.document().frame()->mainWorldScriptContext());
 
-  // Construct the navigation event object.
+  // Construct the loadCommit event object.
   v8::Local<v8::Object> event = v8::Object::New();
   event->Set(v8::String::New(kURL, sizeof(kURL) - 1),
-             v8::String::New(src_.data(), src_.size()));
+     v8::String::New(src_.data(), src_.size()));
   event->Set(v8::String::New(kIsTopLevel, sizeof(kIsTopLevel) - 1),
-             v8::Boolean::New(params.is_top_level));
+     v8::Boolean::New(params.is_top_level));
   v8::Local<v8::Value> val = event;
 
   // TODO(fsamuel): Copying the event listeners is insufficent because
   // new persistent handles are not created when the copy constructor is
   // called. See http://crbug.com/155044.
-  EventListeners listeners(event_listener_map_[kNavigationEventName]);
+  EventListeners listeners(event_listener_map_[kLoadCommitEventName]);
   EventListeners::iterator it = listeners.begin();
   for (; it != listeners.end(); ++it) {
     WebKit::WebFrame* frame = plugin.document().frame();
-    if (frame) {
-      frame->callFunctionEvenIfScriptDisabled(
-          *it, v8::Object::New(), 1, &val);
-    }
+    if (frame)
+      frame->callFunctionEvenIfScriptDisabled(*it, v8::Object::New(), 1, &val);
   }
 }
 
-void BrowserPlugin::LoadStart(const GURL& url, bool is_top_level) {
-  if (!HasListeners(kLoadStartEventName))
+void BrowserPlugin::LoadStop() {
+  if (!HasListeners(kLoadStopEventName))
     return;
 
   WebKit::WebElement plugin = container()->element();
   v8::HandleScope handle_scope;
   v8::Context::Scope context_scope(
       plugin.document().frame()->mainWorldScriptContext());
 
-  // Construct the loadStart event object.
+  // Construct the loadStop event object.
   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;
 
   // TODO(fsamuel): Copying the event listeners is insufficent because
   // new persistent handles are not created when the copy constructor is
   // called. See http://crbug.com/155044.
-  EventListeners listeners(event_listener_map_[kLoadStartEventName]);
+  EventListeners listeners(event_listener_map_[kLoadStopEventName]);
   EventListeners::iterator it = listeners.begin();
   for (; it != listeners.end(); ++it) {
     WebKit::WebFrame* frame = plugin.document().frame();
-    if (frame)
+    if (frame) {

[Charlie Reis, 2012/10/16 21:17:55]

nit: No braces needed, since both the conditional and body fit on one line.

[irobert, 2012/10/17 20:12:37]

Done.

       frame->callFunctionEvenIfScriptDisabled(*it, v8::Object::New(), 1, &val);
+    }
   }
 }
 
 void BrowserPlugin::LoadAbort(const GURL& url,
                               bool is_top_level,
                               const std::string& type) {
   if (!HasListeners(kLoadAbortEventName))
     return;
 
   WebKit::WebElement plugin = container()->element();
@@ skipping 365 matching lines @@
                                                  void* notify_data) {
 }
 
 void BrowserPlugin::didFailLoadingFrameRequest(
     const WebKit::WebURL& url,
     void* notify_data,
     const WebKit::WebURLError& error) {
 }
 
 }  // namespace content