Merge remote-tracking branch 'upstream/master' into screencap

Author: redgecombe

AUTHORS

@@ -33,4 +33,6 @@ Cong Liu <[email protected]>
 Eric Newport <[email protected]>
 Marco Fabbri <[email protected]>
 Daniel Braun <[email protected]>
-Chase Willden <[email protected]>
+Chase Willden <[email protected]>
+Anton Khlynovskiy <[email protected]>
+Wu Yuehang <[email protected]>

CHANGELOG.md

@@ -1,3 +1,26 @@
+0.12.2 / 05-22-2015
+===================
+- Fix #2723: [OSX] cpu hog in some cases
+- Fix #3361: application cache
+- Fix #2720: [Linux] launching sudo hits error: effective uid is not 0
+- Fix #2819: enable cookie support for web sockets
+- Fix #2713: crash with 'new-win-policy' and opening window from iframe
+- Fix #3123: support no-displaying-insecure-content and allow-running-insecure-content
+- [Screen Selection] add application name to the UI; cancelChooseDesktopMedia implementation
+- [Notification] [WIN] disable audio for toast notification, better fallback for toast notification
+- Change cache backend from "simple" to "blockfile"
+
+0.12.1 / 04-13-2015
+===================
+- Fix crash dump generation
+- [WIN] Fix blurry text with High DPI display
+- Fix: Webview : contentWindow not available at this time (#3126)
+- More precise RegExp for App.argv filtering (Thanks to Anton Khlynovskiy)
+- Fix #3143: remote debugging devtools page blank (Thanks to Yuehang Wu)
+- [Notification][Win] fix for missing windows events
+- add Window 'progress' event (Thanks to vadim-kudr <[email protected]>)
+- nw-headers is built automatically now in buildbot (Thanks to Xue Yang)
+
 0.12.0 / 03-05-2015
 =======================
 - Chromium updated to 41.0.2272.76

README.md

@@ -26,10 +26,16 @@ It was created in the Intel Open Source Technology Center.
 * Available on Linux, Mac OS X and Windows
 
 ## Downloads
-* **v0.12.0:** (Mar 5, 2015, based off of IO.js v1.2.0, Chromium 41.0.2272.76): [release notes](https://groups.google.com/d/msg/nwjs-general/NJA-Up4MFug/1jmBPjzklSUJ)  
- * Linux: [32bit](http://dl.nwjs.io/v0.12.0/nwjs-v0.12.0-linux-ia32.tar.gz) / [64bit](http://dl.nwjs.io/v0.12.0/nwjs-v0.12.0-linux-x64.tar.gz)
- * Windows: [32bit](http://dl.nwjs.io/v0.12.0/nwjs-v0.12.0-win-ia32.zip) / [64bit](http://dl.nwjs.io/v0.12.0/nwjs-v0.12.0-win-x64.zip)
- * Mac 10.7+: [32bit](http://dl.nwjs.io/v0.12.0/nwjs-v0.12.0-osx-ia32.zip) / [64bit](http://dl.nwjs.io/v0.12.0/nwjs-v0.12.0-osx-x64.zip)
+* **v0.12.2:** (May 22, 2015, based off of IO.js v1.2.0, Chromium 41.0.2272.76): [release notes](https://groups.google.com/d/msg/nwjs-general/Xbq64dUKZsk/_pTwW7hgAfkJ)  
+ * Linux: [32bit](http://dl.nwjs.io/v0.12.2/nwjs-v0.12.2-linux-ia32.tar.gz) / [64bit](http://dl.nwjs.io/v0.12.2/nwjs-v0.12.2-linux-x64.tar.gz)
+ * Windows: [32bit](http://dl.nwjs.io/v0.12.2/nwjs-v0.12.2-win-ia32.zip) / [64bit](http://dl.nwjs.io/v0.12.2/nwjs-v0.12.2-win-x64.zip)
+ * Mac 10.7+: [32bit](http://dl.nwjs.io/v0.12.2/nwjs-v0.12.2-osx-ia32.zip) / [64bit](http://dl.nwjs.io/v0.12.2/nwjs-v0.12.2-osx-x64.zip)
+
+* **v0.13.0-alpha0:** (May 10, 2015, based off of IO.js v1.5.1, Chromium 43.0.2357.45): [release notes](https://groups.google.com/d/msg/nwjs-general/IqfH1RXNGlw/2PgeRGHO-B4J)  
+ **NOTE** You might want the **SDK build**. Please read the [release notes](https://groups.google.com/d/msg/nwjs-general/IqfH1RXNGlw/2PgeRGHO-B4J)  
+ * Linux: [32bit](http://dl.nwjs.io/v0.13.0/alpha0/nwjs-v0.13.0-alpha0-linux-ia32.tar.gz) / [64bit](http://dl.nwjs.io/v0.13.0/alpha0/nwjs-v0.13.0-alpha0-linux-x64.tar.gz)
+ * Windows: [32bit](http://dl.nwjs.io/v0.13.0/alpha0/nwjs-v0.13.0-alpha0-win-ia32.zip) / [64bit](http://dl.nwjs.io/v0.13.0/alpha0/nwjs-v0.13.0-alpha0-win-x64.zip)
+ * Mac 10.7+: [32bit](http://dl.nwjs.io/v0.13.0/alpha0/nwjs-v0.13.0-alpha0-osx-ia32.zip) / [64bit](http://dl.nwjs.io/v0.13.0/alpha0/nwjs-v0.13.0-alpha0-osx-x64.zip)
 
 * **0.8.6:** (Apr 18, 2014, based off of Node v0.10.22, Chrome 30.0.1599.66) **If your native Node module works only with Node v0.10, then you should use node-webkit v0.8.x, which is also a maintained branch. [More info](https://groups.google.com/d/msg/nwjs-general/2OJ1cEMPLlA/09BvpTagSA0J)**  
 [release notes](https://groups.google.com/d/msg/nwjs-general/CLPkgfV-i7s/hwkkQuJ1kngJ)
@@ -38,7 +44,7 @@ It was created in the Intel Open Source Technology Center.
  * Windows: [win32](http://dl.node-webkit.org/v0.8.6/node-webkit-v0.8.6-win-ia32.zip)
  * Mac: [32bit, 10.7+](http://dl.node-webkit.org/v0.8.6/node-webkit-v0.8.6-osx-ia32.zip)
 
-* **latest live build**: git tip version; build triggered from every git commit: http://dl.node-webkit.org/live-build/
+* **latest live build**: git tip version; build triggered from every git commit: http://dl.nwjs.io/live-build/
 
 * [Previous versions](https://github.com/rogerwang/node-webkit/wiki/Downloads-of-old-versions)
 
@@ -67,6 +73,7 @@ Create `package.json`:
 ```json
 {
   "name": "nw-demo",
+  "version": "0.0.1",
   "main": "index.html"
 }
 ```
@@ -78,10 +85,9 @@ $ /path/to/nw .  (suppose the current directory contains 'package.json')
 
 Note: on Windows, you can drag the folder containing `package.json` to `nw.exe` to open it.
 
-Note: on OSX, the executable binary is in a hidden directory within the .app file. To run node-webkit on OSX, type:
-```bash
-$ /path/to/node-webkit.app/Contents/MacOS/node-webkit .  (suppose the current directory contains 'package.json')
-```
+Note: on OSX, the executable binary is in a hidden directory within the .app file. To run node-webkit on OSX, type:  
+`/path/to/nwjs.app/Contents/MacOS/nwjs .` *(suppose the current directory contains 'package.json')*   
+
 ## Documents
 
 For more information on how to write/package/run apps, see:

src/api/app/app.js

@@ -26,10 +26,10 @@ function App() {
 require('util').inherits(App, exports.Base);
 
 App.filteredArgv = [
-  /--no-toolbar/,
-  /--url=.*/,
-  /--remote-debugging-port=.*/,
-  /--renderer-cmd-prefix.*/,
+  /^--no-toolbar$/,
+  /^--url=/,
+  /^--remote-debugging-port=/,
+  /^--renderer-cmd-prefix/,
 ];
 
 App.prototype.quit = function() {

src/api/clipboard/clipboard.js

@@ -30,7 +30,7 @@ Clipboard.prototype.set = function(data, type) {
     type = 'text';
 
   if (type != 'text')
-    throw new String("Type of '" + type + "' is not supported");
+    throw new TypeError("Type of '" + type + "' is not supported");
 
   nw.callObjectMethod(this, 'Set', [ data, type ]);
 }
@@ -40,7 +40,7 @@ Clipboard.prototype.get = function(type) {
     type = 'text';
 
   if (type != 'text')
-    throw new String('Only support getting plain text from Clipboard');
+    throw new TypeError('Only support getting plain text from Clipboard');
 
   var result = nw.callObjectMethodSync(this, 'Get', [ type ]);
   if (type == 'text')

src/api/dispatcher.cc

@@ -217,8 +217,10 @@ void Dispatcher::willHandleNavigationPolicy(
   v8::HandleScope handleScope(isolate);
 
   v8::Handle<v8::Value> id_val;
-  if (web_view->mainFrame() && !web_view->mainFrame()->mainWorldScriptContext().IsEmpty())
+  if (web_view->mainFrame() && !web_view->mainFrame()->mainWorldScriptContext().IsEmpty()) {
+    v8::Context::Scope cscope (web_view->mainFrame()->mainWorldScriptContext());
     id_val = nwapi::Dispatcher::GetWindowId(web_view->mainFrame());
+  }
   if (id_val.IsEmpty())
     return;
   if (id_val->IsUndefined() || id_val->IsNull())

src/api/menu/menu.js

@@ -27,7 +27,7 @@ function Menu(option) {
     option = { type: 'contextmenu' };
 
   if (option.type != 'contextmenu' && option.type != 'menubar')
-    throw new String('Invalid menu type: ' + option.type);
+    throw new TypeError('Invalid menu type: ' + option.type);
 
   this.type = option.type;
   v8_util.setHiddenValue(this, 'items', []);
@@ -40,12 +40,12 @@ Menu.prototype.__defineGetter__('items', function() {
 });
 
 Menu.prototype.__defineSetter__('items', function(val) {
-  throw new String('Menu.items is immutable');
+  throw new Error('Menu.items is immutable');
 });
 
 Menu.prototype.append = function(menu_item) {
   if (v8_util.getConstructorName(menu_item) != 'MenuItem')
-    throw new String("Menu.append() requires a valid MenuItem");
+    throw new TypeError("Menu.append() requires a valid MenuItem");
 
   this.items.push(menu_item);
   nw.callObjectMethod(this, 'Append', [ menu_item.id ]);

src/api/menuitem/menuitem.js

@@ -22,22 +22,22 @@ var v8_util = process.binding('v8_util');
 
 function MenuItem(option) {
   if (typeof option != 'object')
-    throw new String('Invalid option.');
+    throw new TypeError('Invalid option.');
 
   if (!option.hasOwnProperty('type'))
     option.type = 'normal';
 
   if (option.type != 'normal' &&
       option.type != 'checkbox' &&
       option.type != 'separator')
-    throw new String('Invalid MenuItem type: ' + option.type);
+    throw new TypeError('Invalid MenuItem type: ' + option.type);
 
   if (option.type == 'normal' || option.type == 'checkbox') {
     if (option.type == 'checkbox')
       option.checked = Boolean(option.checked);
 
     if (!option.hasOwnProperty('label'))
-      throw new String('A normal MenuItem must have a label');
+      throw new TypeError('A normal MenuItem must have a label');
     else
       option.label = String(option.label);
 
@@ -59,7 +59,7 @@ function MenuItem(option) {
 
     if (option.hasOwnProperty('submenu')) {
       if (v8_util.getConstructorName(option.submenu) != 'Menu')
-        throw new String("'submenu' must be a valid Menu");
+        throw new TypeError("'submenu' must be a valid Menu");
 
       // Transfer only object id
       v8_util.setHiddenValue(this, 'submenu', option.submenu);
@@ -68,7 +68,7 @@ function MenuItem(option) {
 
     if (option.hasOwnProperty('click')) {
       if (typeof option.click != 'function')
-        throw new String("'click' must be a valid Function");
+        throw new TypeError("'click' must be a valid Function");
       else
         this.click = option.click;
     }
@@ -100,7 +100,7 @@ MenuItem.prototype.__defineGetter__('type', function() {
 });
 
 MenuItem.prototype.__defineSetter__('type', function() {
-  throw new String("'type' is immutable at runtime");
+  throw new Error("'type' is immutable at runtime");
 });
 
 MenuItem.prototype.__defineGetter__('label', function() {
@@ -162,7 +162,7 @@ MenuItem.prototype.__defineGetter__('checked', function() {
 
 MenuItem.prototype.__defineSetter__('checked', function(val) {
   if (this.type != 'checkbox')
-    throw new String("'checked' property is only available for checkbox");
+    throw new TypeError("'checked' property is only available for checkbox");
 
   this.handleSetter('checked', 'SetChecked', Boolean, val);
 });
@@ -181,7 +181,7 @@ MenuItem.prototype.__defineGetter__('submenu', function() {
 
 MenuItem.prototype.__defineSetter__('submenu', function(val) {
   if (v8_util.getConstructorName(val) != 'Menu')
-    throw new String("'submenu' property requries a valid Menu");
+    throw new TypeError("'submenu' property requries a valid Menu");
 
   v8_util.setHiddenValue(this, 'submenu', val);
   nw.callObjectMethod(this, 'SetSubmenu', [ val.id ]);

src/api/screen/desktop_capture_api.cc

@@ -12,6 +12,8 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/nw/src/nw_package.h"
+#include "content/nw/src/nw_shell.h"
 #include "net/base/net_util.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
@@ -68,7 +70,8 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunSync() {
   // also be used to determine where to show the picker's UI.
   content::WebContents* web_contents = content::WebContents::FromRenderViewHost(render_view_host());
   DCHECK(web_contents);
-  base::string16 target_name;
+  content::Shell* shell = content::Shell::windows()[0];
+  base::string16 app_name = base::UTF8ToUTF16(shell->GetPackage()->GetName());
 
   // Register to be notified when the tab is closed.
   Observe(web_contents);
@@ -136,8 +139,8 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunSync() {
   picker_->Show(web_contents,
                 parent_window,
                 parent_window,
-                target_name,
-                target_name,
+                app_name,
+                app_name,
                 media_list.Pass(),
                 callback);
   return true;

src/api/screen/screen.cc

@@ -164,6 +164,14 @@ void Screen::Call(DispatcherHost* dispatcher_host,
       // Screen Picker GUI is still active, return false;
       result->AppendBoolean(false);
     }
+  } else if (method == "CancelChooseDesktopMedia") {
+    if (gpDCCDMF) {
+      gpDCCDMF->Cancel();
+      gpDCCDMF = NULL;
+      result->AppendBoolean(true);
+    } else {
+      result->AppendBoolean(false);
+    }
   }
 
 }