support policy.setNewWindowManifest in 'new-win-policy'

rogerwang · rogerwang · commit f0d71dc210da · 2014-12-02T10:13:48.000+08:00
Fix nwjs#2543
diff --git a/src/api/dispatcher.cc b/src/api/dispatcher.cc
@@ -205,7 +205,8 @@ void Dispatcher::willHandleNavigationPolicy(
     content::RenderView* rv,
     blink::WebFrame* frame,
     const blink::WebURLRequest& request,
-    blink::WebNavigationPolicy* policy) {
+    blink::WebNavigationPolicy* policy,
+    blink::WebString* manifest) {
 
   blink::WebView* web_view = rv->GetWebView();
 
@@ -246,6 +247,15 @@ void Dispatcher::willHandleNavigationPolicy(
   v8::Handle<v8::Value> argv[] = {id_val, v8_str("new-win-policy"), args };
 
   node::MakeCallback(isolate, objects_registry, "handleEvent", 3, argv);
+  v8::Local<v8::Value> manifest_val = policy_obj->Get(v8_str("manifest"));
+
+  //TODO: change this to object
+  if (manifest_val->IsString()) {
+    v8::String::Utf8Value manifest_str(manifest_val);
+    if (manifest)
+      *manifest = blink::WebString::fromUTF8(*manifest_str);
+  }
+
   v8::Local<v8::Value> val = policy_obj->Get(v8_str("val"));
   if (!val->IsString())
     return;
diff --git a/src/api/dispatcher.h b/src/api/dispatcher.h
@@ -54,7 +54,8 @@ class Dispatcher : public content::RenderViewObserver {
     content::RenderView* rv,
     blink::WebFrame* frame,
     const blink::WebURLRequest& request,
-    blink::WebNavigationPolicy* policy);
+    blink::WebNavigationPolicy* policy,
+    blink::WebString* manifest);
 
  private:
   // RenderViewObserver implementation.
diff --git a/src/api/window_bindings.js b/src/api/window_bindings.js
@@ -146,6 +146,7 @@ Window.prototype.handleEvent = function(ev) {
         policy.forceDownload  =  function () { this.val = 'download'; };
         policy.forceNewWindow =  function () { this.val = 'new-window'; };
         policy.forceNewPopup  =  function () { this.val = 'new-popup'; };
+        policy.setNewWindowManifest = function (m) { this.manifest = JSON.stringify(m); };
     }
   // Route events to EventEmitter.
   this.emit.apply(this, arguments);
diff --git a/src/nw_shell.cc b/src/nw_shell.cc
@@ -21,6 +21,7 @@
 #include "content/nw/src/nw_shell.h"
 
 #include "base/command_line.h"
+#include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -568,11 +569,18 @@ void Shell::WebContentsCreated(WebContents* source_contents,
                                int source_frame_id,
                                const base::string16& frame_name,
                                const GURL& target_url,
-                               WebContents* new_contents) {
+                               WebContents* new_contents,
+                               const base::string16& nw_window_manifest) {
   // Create with package's manifest
   scoped_ptr<base::DictionaryValue> manifest(
       GetPackage()->window()->DeepCopy());
 
+  scoped_ptr<base::Value> val;
+  std::string manifest_str = base::UTF16ToUTF8(nw_window_manifest);
+  val.reset(base::JSONReader().ReadToValue(manifest_str));
+  if (val.get() && val->IsType(base::Value::TYPE_DICTIONARY))
+    manifest.reset(static_cast<base::DictionaryValue*>(val.release()));
+
   // Get window features
   blink::WebWindowFeatures features = new_contents->GetWindowFeatures();
   manifest->SetBoolean(switches::kmResizable, features.resizable);
diff --git a/src/nw_shell.h b/src/nw_shell.h
@@ -165,7 +165,8 @@ class Shell : public WebContentsDelegate,
                                   int source_frame_id,
                                   const base::string16& frame_name,
                                   const GURL& target_url,
-                                  WebContents* new_contents) OVERRIDE;
+                                  WebContents* new_contents,
+                                  const base::string16& nw_window_manifest) OVERRIDE;
   virtual void ToggleFullscreenModeForTab(WebContents* web_contents,
                                           bool enter_fullscreen) OVERRIDE;
   virtual bool IsFullscreenForTabOrPending(
diff --git a/src/renderer/shell_content_renderer_client.cc b/src/renderer/shell_content_renderer_client.cc
@@ -502,9 +502,10 @@ void ShellContentRendererClient::willHandleNavigationPolicy(
     RenderView* rv,
     blink::WebFrame* frame,
     const blink::WebURLRequest& request,
-    blink::WebNavigationPolicy* policy) {
+    blink::WebNavigationPolicy* policy,
+    blink::WebString* manifest) {
 
-  nwapi::Dispatcher::willHandleNavigationPolicy(rv, frame, request, policy);
+  nwapi::Dispatcher::willHandleNavigationPolicy(rv, frame, request, policy, manifest);
 }
 
 void ShellContentRendererClient::windowOpenBegin(const blink::WebURL& url) {
diff --git a/src/renderer/shell_content_renderer_client.h b/src/renderer/shell_content_renderer_client.h
@@ -54,7 +54,8 @@ class ShellContentRendererClient : public ContentRendererClient {
   virtual void willHandleNavigationPolicy(RenderView* rv,
                                           blink::WebFrame* frame,
                                           const blink::WebURLRequest& request,
-                                          blink::WebNavigationPolicy* policy) OVERRIDE;
+                                          blink::WebNavigationPolicy* policy,
+                                          blink::WebString* manifest = NULL) OVERRIDE;
 
   virtual void windowOpenBegin(const blink::WebURL& url) OVERRIDE;
   virtual void windowOpenEnd() OVERRIDE;

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,7 @@ Window.prototype.handleEvent = function(ev) {`
`146`	`146`	`policy.forceDownload = function () { this.val = 'download'; };`
`147`	`147`	`policy.forceNewWindow = function () { this.val = 'new-window'; };`
`148`	`148`	`policy.forceNewPopup = function () { this.val = 'new-popup'; };`
	`149`	`+ policy.setNewWindowManifest = function (m) { this.manifest = JSON.stringify(m); };`
`149`	`150`	`}`
`150`	`151`	`// Route events to EventEmitter.`
`151`	`152`	`this.emit.apply(this, arguments);`