add 'new-win-policy' event

rogerwang · rogerwang · commit 0ea0956d5b94 · 2014-01-15T13:41:53.000+08:00
Fix nwjs#1375 nwjs#1290
diff --git a/src/api/dispatcher.cc b/src/api/dispatcher.cc
@@ -172,9 +172,63 @@ void Dispatcher::documentCallback(const char* ev, WebKit::WebFrame* frame) {
                             frame->mainWorldScriptContext()->GetIsolate());
   }
   args->Set(0, element);
-  v8::Handle<v8::Value> argv[] = {val, v8::String::New(ev), args };
+  v8::Handle<v8::Value> argv[] = {val, v8_str(ev), args };
 
   node::MakeCallback(objects_registry, "handleEvent", 3, argv);
 }
 
+void Dispatcher::willHandleNavigationPolicy(
+    content::RenderView* rv,
+    WebKit::WebFrame* frame,
+    const WebKit::WebURLRequest& request,
+    WebKit::WebNavigationPolicy* policy) {
+
+  WebKit::WebView* web_view = rv->GetWebView();
+
+  if (!web_view)
+    return;
+
+  v8::Context::Scope cscope (web_view->mainFrame()->mainWorldScriptContext());
+
+  v8::Handle<v8::Value> id_val = nwapi::Dispatcher::GetWindowId(web_view->mainFrame());
+  if (id_val->IsNull() || id_val->IsUndefined())
+    return;
+
+  v8::Handle<v8::Object> objects_registry = nwapi::Dispatcher::GetObjectRegistry();
+  if (objects_registry->IsUndefined())
+    return;
+
+  v8::Local<v8::Array> args = v8::Array::New();
+  v8::Handle<v8::Value> element = v8::Null();
+  v8::Handle<v8::Object> policy_obj = v8::Object::New();
+
+  WebCore::Frame* core_frame = WebKit::toWebFrameImpl(frame)->frame();
+  if (core_frame->ownerElement()) {
+    element = WebCore::toV8((WebCore::HTMLElement*)core_frame->ownerElement(),
+                            frame->mainWorldScriptContext()->Global(),
+                            frame->mainWorldScriptContext()->GetIsolate());
+  }
+  args->Set(0, element);
+  args->Set(1, v8_str(request.url().string().utf8().c_str()));
+  args->Set(2, policy_obj);
+
+  v8::Handle<v8::Value> argv[] = {id_val, v8_str("new-win-policy"), args };
+
+  node::MakeCallback(objects_registry, "handleEvent", 3, argv);
+  v8::Local<v8::Value> val = policy_obj->Get(v8_str("val"));
+  if (!val->IsString())
+    return;
+  v8::String::Utf8Value policy_str(val);
+  if (!strcmp(*policy_str, "ignore"))
+    *policy = WebKit::WebNavigationPolicyIgnore;
+  else if (!strcmp(*policy_str, "download"))
+    *policy = WebKit::WebNavigationPolicyDownload;
+  else if (!strcmp(*policy_str, "current"))
+    *policy = WebKit::WebNavigationPolicyCurrentTab;
+  else if (!strcmp(*policy_str, "new-window"))
+    *policy = WebKit::WebNavigationPolicyNewWindow;
+  else if (!strcmp(*policy_str, "new-popup"))
+    *policy = WebKit::WebNavigationPolicyNewPopup;
+}
+
 }  // namespace nwapi
diff --git a/src/api/dispatcher.h b/src/api/dispatcher.h
@@ -23,14 +23,20 @@
 
 #include "base/basictypes.h"
 #include "content/public/renderer/render_view_observer.h"
+#include "third_party/WebKit/public/web/WebNavigationPolicy.h"
 #include <v8.h>
 
 namespace base {
 class ListValue;
 }
 
+namespace content {
+class RenderView;
+}
+
 namespace WebKit {
 class WebFrame;
+class WebURLRequest;
 }
 
 namespace nwapi {
@@ -42,6 +48,11 @@ class Dispatcher : public content::RenderViewObserver {
 
   static v8::Handle<v8::Object> GetObjectRegistry();
   static v8::Handle<v8::Value> GetWindowId(WebKit::WebFrame* frame);
+  static void willHandleNavigationPolicy(
+    content::RenderView* rv,
+    WebKit::WebFrame* frame,
+    const WebKit::WebURLRequest& request,
+    WebKit::WebNavigationPolicy* policy);
 
  private:
   // RenderViewObserver implementation.
diff --git a/src/renderer/shell_content_renderer_client.cc b/src/renderer/shell_content_renderer_client.cc
@@ -414,4 +414,13 @@ void ShellContentRendererClient::UninstallNodeSymbols(
   }
 }
 
+void ShellContentRendererClient::willHandleNavigationPolicy(
+    RenderView* rv,
+    WebKit::WebFrame* frame,
+    const WebKit::WebURLRequest& request,
+    WebKit::WebNavigationPolicy* policy) {
+
+  nwapi::Dispatcher::willHandleNavigationPolicy(rv, frame, request, policy);
+}
+
 }  // namespace content
diff --git a/src/renderer/shell_content_renderer_client.h b/src/renderer/shell_content_renderer_client.h
@@ -51,6 +51,11 @@ class ShellContentRendererClient : public ContentRendererClient {
   virtual bool WillSetSecurityToken(WebKit::WebFrame* frame,
                                     v8::Handle<v8::Context>) OVERRIDE;
 
+  virtual void willHandleNavigationPolicy(RenderView* rv,
+                                          WebKit::WebFrame* frame,
+                                          const WebKit::WebURLRequest& request,
+                                          WebKit::WebNavigationPolicy* policy) OVERRIDE;
+
  private:
   scoped_ptr<ShellRenderProcessObserver> shell_observer_;
   scoped_ptr<nwapi::WindowBindings> window_bindings_;

Original file line number	Diff line number	Diff line change
`@@ -414,4 +414,13 @@ void ShellContentRendererClient::UninstallNodeSymbols(`
`414`	`414`	`}`
`415`	`415`	`}`
`416`	`416`
	`417`	`+void ShellContentRendererClient::willHandleNavigationPolicy(`
	`418`	`+ RenderView* rv,`
	`419`	`+ WebKit::WebFrame* frame,`
	`420`	`+ const WebKit::WebURLRequest& request,`
	`421`	`+ WebKit::WebNavigationPolicy* policy) {`
	`422`	`+`
	`423`	`+ nwapi::Dispatcher::willHandleNavigationPolicy(rv, frame, request, policy);`
	`424`	`+}`
	`425`	`+`
`417`	`426`	`} // namespace content`