Merge branch 'master' into breakpad

This commit is contained in:
Cheng Zhao 2013-11-22 19:37:34 +08:00
commit 59b3e74542
14 changed files with 129 additions and 21 deletions

View file

@ -290,6 +290,23 @@ Starts inspecting element at position (`x`, `y`).
### BrowserWindow.restartHangMonitorTimeout()
### BrowserWindow.capturePage([rect, ]callback)
* `rect` Object - The area of page to be captured
* `x`
* `y`
* `width`
* `height`
* `callback` Function
Captures the snapshot of page within `rect`, upon completion `callback` would be
called with `callback(image)`, the `image` is a `Buffer` that stores the PNG
encoded data of the snapshot. Omitting the `rect` would capture the whole
visible page.
You can write received `image` directly to a `.png` file, or you can base64
encode it and use data URL to embed the image in HTML.
### BrowserWindow.getPageTitle()
Returns the title of web page.

View file

@ -23,5 +23,4 @@
## Notes on accelerator
On Linux and Windows, the `Command` would be translated to `Ctrl`, so usually
you can use `Command` for most of the commands.
On Linux and Windows, the `Command` key would not have any effect.