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 29 matching lines @@
 using WebKit::WebVector;
 
 namespace content {
 
 namespace {
 const char kCrashEventName[] = "crash";
 const char kIsTopLevel[] = "isTopLevel";
 const char kLoadAbortEventName[] = "loadAbort";
 const char kLoadRedirectEventName[] = "loadRedirect";
 const char kLoadStartEventName[] = "loadStart";
+const char kLoadStopEventName[] = "loadStop";
+const char kLoadCommitEventName[] = "loadCommit";

[Charlie Reis, 2012/10/08 19:03:39]

Please keep these alphabetized.

[irobert, 2012/10/10 23:55:16]

Done.

 const char kNavigationEventName[] = "navigation";

[Charlie Reis, 2012/10/08 19:03:39]

We can remove this one now, right?

[irobert, 2012/10/10 23:55:16]

Done.

 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 268 matching lines @@
     v8::Context::Scope context_scope(v8::Context::New());
     v8::HandleScope handle_scope;
     container()->element().document().frame()->
         callFunctionEvenIfScriptDisabled(*it,
                                          v8::Object::New(),
                                          0,
                                          NULL);
   }
 }
 
-void BrowserPlugin::DidNavigate(const GURL& url, int process_id) {
-  src_ = url.spec();
-  process_id_ = process_id;
-  if (!HasListeners(kNavigationEventName))
+void BrowserPlugin::LoadStop() {
+  if (!HasListeners(kLoadStopEventName))
     return;
+  EventListeners& listeners = event_listener_map_[kLoadStopEventName];
+  EventListeners::iterator it = listeners.begin();
 
-  EventListeners& listeners = event_listener_map_[kNavigationEventName];
-  EventListeners::iterator it = listeners.begin();
+  v8::Context::Scope context_scope(v8::Context::New());
+  v8::HandleScope handle_scope;
+  // Construct the loadStop event object.
+  v8::Local<v8::Value> event =
+      v8::Local<v8::Object>::New(v8::Object::New());
   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()));
+    // Fire the event listener.
     container()->element().document().frame()->
         callFunctionEvenIfScriptDisabled(*it,
                                          v8::Object::New(),
                                          1,
-                                         &param);
+                                         &event);
   }
 }
 
+void BrowserPlugin::LoadCommit(
+    const GURL& url,
+    int process_id,
+    bool is_top_level) {
+  process_id_ = process_id;
+  if (!HasListeners(kLoadCommitEventName))
+    return;
+
+  EventListeners& listeners = event_listener_map_[kLoadCommitEventName];
+  EventListeners::iterator it = listeners.begin();
+
+  v8::Context::Scope context_scope(v8::Context::New());

[Charlie Reis, 2012/10/08 19:03:39]

Note: We've learned that this approach doesn't work.  I'll try to give you a
better pattern to use after our meeting with Adam this afternoon.

[irobert, 2012/10/10 23:55:16]

Done.

+  v8::HandleScope handle_scope;
+  // Construct the loadCommit 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));
+  for (; it != listeners.end(); ++it) {
+    // Fire the event listener.
+    container()->element().document().frame()->
+        callFunctionEvenIfScriptDisabled(*it,
+                                         v8::Object::New(),
+                                         1,
+                                         &event);
+  }
+}
+
 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());
   v8::HandleScope handle_scope;
   // Construct the loadStart event object.
@@ skipping 358 matching lines @@
                                                  void* notify_data) {
 }
 
 void BrowserPlugin::didFailLoadingFrameRequest(
     const WebKit::WebURL& url,
     void* notify_data,
     const WebKit::WebURLError& error) {
 }
 
 }  // namespace content