Commit graph

276 commits

Author SHA1 Message Date
Cheng Zhao
2b2a55d870 Update apm: fix node arch on Linux. 2014-02-21 16:23:04 +08:00
Cheng Zhao
4051d2ebdb Merge branch 'master' into linux
Conflicts:
	atom.gyp
	vendor/apm
	vendor/brightray
2014-02-14 13:17:00 +00:00
Cheng Zhao
283aa79c17 Fix assertions when building against Debug libchromiumcontent.
Imported from https://github.com/brightray/brightray/pull/50.
2014-02-05 11:18:32 +08:00
Cheng Zhao
e0f660301c Specify the commit of libchromiumcontent to download. 2014-01-31 12:09:43 +08:00
Cheng Zhao
2f798c5116 Merge branch 'master' into linux
Conflicts:
	vendor/apm
2014-01-15 11:18:40 +00:00
Cheng Zhao
8655dec00e Crash when there is fatal error in V8. 2014-01-23 20:30:44 +08:00
Cheng Zhao
4a1f8cf1c9 Activate uv loop when uv loop's watcher queue changes, fixes #159. 2014-01-18 16:56:46 +08:00
Cheng Zhao
a2bf1b3907 Update to latest apm. 2014-01-18 16:29:24 +08:00
Cheng Zhao
84529de10d Update apm: update node version to v0.11.10. 2014-01-10 18:50:53 +08:00
Cheng Zhao
535b936c87 Update node to v0.11.10. 2014-01-10 18:24:44 +08:00
Cheng Zhao
2755fbaadf Update apm. 2014-01-07 02:50:52 -08:00
Cheng Zhao
7ca152070a Update brightray. 2014-01-01 02:31:33 +00:00
Cheng Zhao
63852a8c82 Update brightray for linux_clang flag. 2013-12-31 11:16:18 +00:00
Cheng Zhao
c97afdbdb3 Update apm. 2013-12-31 08:33:17 +00:00
Cheng Zhao
cfca12d4a5 Use the gyp vendored by brightray. 2013-12-25 18:47:19 +08:00
Cheng Zhao
754cd88cc2 Update brightray: Fix building on Windows. 2013-12-24 16:05:50 +08:00
Cheng Zhao
902be9bab5 Update node: Removed two unused patches. 2013-12-20 14:20:24 +08:00
Cheng Zhao
c82e73a4ec Update apm: Fix installing for node v0.11.x. 2013-12-16 22:37:43 +08:00
Cheng Zhao
09201e3e65 Update brightray: Remove webkit hacks. 2013-12-16 21:19:12 +08:00
Cheng Zhao
8fc1e055bf Update apm for node version and architecture change. 2013-12-16 14:40:03 +08:00
Cheng Zhao
abf982e4e5 Remove the on_watcher_queue_updated hack. 2013-12-15 19:50:43 +08:00
Cheng Zhao
886ebdb002 Use node's Environment feature to add "require" in renderer. 2013-12-15 14:20:28 +08:00
Cheng Zhao
2413eebd7b Disable accelerated compositing to fix everything. 2013-12-13 00:57:08 +08:00
Cheng Zhao
7708e7a8c4 Update node for renderer node integration fixes. 2013-12-12 16:49:56 +08:00
Cheng Zhao
28f5d184b3 Do not depend on node to set include_dirs.
Part of atom/node#2.
2013-12-12 14:07:00 +08:00
Cheng Zhao
fc00da9732 Update brightray, which contains all our patches in master. 2013-12-12 10:43:50 +08:00
Cheng Zhao
e4bfa373de Fix node integration to browser after updated to Chrome31. 2013-12-11 23:59:03 +08:00
Cheng Zhao
409a431892 Huge commit to use new V8 and Content APIs.
Still got a lots of linking errors!
2013-12-11 15:48:19 +08:00
Cheng Zhao
0a37852757 Update to node v0.11.9. 2013-12-10 14:07:32 +08:00
Cheng Zhao
42ffa5813f Update libchromiumcontent and brightray to use Chrome31. 2013-12-09 17:23:32 +08:00
Cheng Zhao
b431e96f9d Update node: Add fs.lstatSyncNoException, closes #138. 2013-12-06 21:51:47 +08:00
Cheng Zhao
8d271a6655 Update node: Fixed a handle leak in fs.statNoException(). 2013-12-05 21:41:39 +08:00
Cheng Zhao
ffaf535d00 Add script to generate symbols from pdbs on Windows. 2013-11-26 21:23:50 +08:00
Cheng Zhao
59b3e74542 Merge branch 'master' into breakpad 2013-11-22 19:37:34 +08:00
Cheng Zhao
3b4a45ac65 Add BrowserWindow.capturePage API. 2013-11-22 14:23:19 +08:00
Cheng Zhao
896c1793d3 mac: Copy necessary breakpad binaries to package. 2013-11-13 17:20:51 +08:00
Cheng Zhao
57bee8b788 Update to latest gyp and depot_tools. 2013-11-12 18:34:01 +08:00
Cheng Zhao
2768eaa676 Add breakpad. 2013-11-12 15:49:03 +08:00
Cheng Zhao
01dd5638d0 Update brightray for fixing the 'ARCHS' issue. 2013-11-08 19:05:30 -08:00
Cheng Zhao
dc1a8b644a Get the status of devtools from brightray, fixed #27. 2013-11-05 10:32:45 +08:00
Cheng Zhao
f2c1d8f4b2 Update to latest apm. 2013-10-26 17:24:40 +08:00
Cheng Zhao
aa6d5a3ff6 Update to latest apm. 2013-10-02 20:26:25 +08:00
Cheng Zhao
99d901bc9a Switch to use the ProxyResolverV8, fixes atom/atom#894. 2013-09-29 15:06:29 +08:00
Cheng Zhao
a73aea3bda Update apm: set both HOME and USERPROFILE in environment under Windows. 2013-09-09 09:24:54 +08:00
Cheng Zhao
6a322f8bd6 Update apm for node v0.10.18. 2013-09-05 15:41:44 +08:00
Cheng Zhao
aad0c8e996 Update node to v0.10.18. 2013-09-05 15:15:13 +08:00
Cheng Zhao
e17da272f4 Make child_process.fork work when options.env is set. 2013-09-05 09:47:32 +08:00
Cheng Zhao
88bdff5832 Use environment variable to detect whether to run as node. 2013-09-05 09:22:24 +08:00
Cheng Zhao
3b7dd85d3f Merge pull request #65 from atom/custom-protocol
Support custom protocols
2013-09-04 03:33:09 -07:00
Cheng Zhao
d8cd3d78ff Make ReadRawData a public member, so there is no need to detect types. 2013-08-30 20:49:27 +08:00
Cheng Zhao
19aa2b7979 Update apm. 2013-08-29 11:30:56 +08:00
Paul Betts
566b8136c9 Force pushery? 2013-08-28 13:27:49 +02:00
Paul Betts
c8150e570b Version bump atom/apm to fix script/bootstrap.py on Win32 2013-08-28 13:14:54 +02:00
Cheng Zhao
d2b4b761ba Update node: fix #66. 2013-08-27 18:39:32 +08:00
Kevin Sawicki
fd299cb3fe Upgrade apm for more logging on errors 2013-08-21 10:47:48 -07:00
Kevin Sawicki
dea52ae767 Upgrade apm for output fixes 2013-08-20 09:41:10 -07:00
Cheng Zhao
7c85479e90 Update libchromiumcontent: Add "path" attribute for "File" class. 2013-08-19 21:27:24 +08:00
Cheng Zhao
149e2a4680 Update brightray: Disable Chromium's DataExtension. 2013-08-13 16:38:24 +08:00
Cheng Zhao
543ed1de98 Fix test case for the d3 module. 2013-08-12 17:11:47 +08:00
Cheng Zhao
b0b6214416 Update node: enable running like upstream node. 2013-08-08 16:57:07 +08:00
Cheng Zhao
574811fee0 Fix process.argv[0] for child_process.fork. 2013-08-08 16:57:07 +08:00
Cheng Zhao
216f5917bf When passing --atom-child_process-fork, run like upstream node. 2013-08-08 16:57:07 +08:00
Paul Betts
beba4efc9f Fix broken submodule reference 2013-08-07 09:49:02 -07:00
Cheng Zhao
f46d5eb651 Update apm: Add support for Windows. 2013-08-06 20:24:51 +08:00
Cheng Zhao
192216ea64 Update node before running npm. 2013-08-03 16:38:02 +08:00
Cheng Zhao
d888f5cc31 Revert "Enable getUserMedia(). Part of fixes for #31."
Now the getUserMedia is implemented in brightray.

This reverts commit f26db5c7a1.

Conflicts:
	atom.gyp
2013-08-01 14:50:06 +08:00
Cheng Zhao
51cf1db652 Update brightray. 2013-07-31 13:05:30 +08:00
Cheng Zhao
2c237e9d08 Update node: fix child_process.fork on Windows. 2013-07-31 12:36:29 +08:00
Cheng Zhao
0acaff48b8 Update node: fix process.stdio. 2013-07-31 12:30:07 +08:00
Cheng Zhao
64b68add3d Update to latest libchromiumcontent and node. 2013-07-26 19:18:27 +08:00
Cheng Zhao
bbc049ba3a [Win] Update node: fix console and process.stdout. 2013-07-24 15:37:40 +08:00
Cheng Zhao
6045a5299f Update node: fix process.nextTick. 2013-07-17 10:48:00 +08:00
Cheng Zhao
4d1d1fee9e Update node: use node's implementation of setImmediate.
Fixes #35.
2013-07-15 15:45:10 +08:00
Cheng Zhao
598f3cdcd9 Update gyp and depot_tools. 2013-07-10 08:36:26 +08:00
Cheng Zhao
9ca650ffcc Update brightray. 2013-07-09 22:57:02 +08:00
Cheng Zhao
25d9c1a14d Add process.activateUvLoop() API. 2013-07-09 20:38:44 +08:00
Cheng Zhao
4c71fbb68b [Win] views_chromiumcontent.lib is renamed to chromiumviews.lib. 2013-07-09 12:26:31 +08:00
Cheng Zhao
7dae2c4966 Link to the views module as static library. 2013-07-09 10:22:38 +08:00
Cheng Zhao
6a48faebe3 Update node: fix cefode.js on Windows. 2013-07-08 12:42:26 +08:00
Cheng Zhao
950c09f2e7 Use depot_tools to provide ninja binary and cpplint. 2013-07-07 16:25:50 +08:00
Cheng Zhao
3cd910abc6 Use process.resourcePath to locate js files. 2013-07-07 11:20:30 +08:00
Cheng Zhao
72f74d7c0d Update brightray: fix linking errors of libchromiumcontent. 2013-07-06 08:38:03 +08:00
Cheng Zhao
d473fcbf64 Implement basic methods of NativeWindowWin. 2013-07-05 18:33:37 +08:00
Cheng Zhao
e9e9246184 Update to latest brightray. 2013-07-03 13:53:45 +08:00
Cheng Zhao
9c9d62c3a9 Should write a meaningful config.gypi for node.
Node is parsing it for 'process.config', empty file would cause
exception.
2013-07-02 22:23:13 +08:00
Cheng Zhao
304f9cc01a Update node: fix link error in uv. 2013-07-02 18:30:39 +08:00
Cheng Zhao
7a27537c89 Update brightray: fix building with ninja. 2013-07-02 17:33:43 +08:00
Cheng Zhao
84b8442ef8 Update node: removed a few more unused patches. 2013-07-02 09:28:48 +08:00
Cheng Zhao
a749a6dc2d Include node's config.gypi in atom-shell.
Removed 3 commits of our node fork.
2013-07-02 09:16:56 +08:00
Cheng Zhao
f61a7ee5eb Define 'python' variable in atom-shell.
Removed a patch in node.
2013-07-02 08:52:06 +08:00
Cheng Zhao
384e83972f Make node static library build. 2013-07-01 17:58:01 +08:00
Cheng Zhao
bafd6a5c49 Ship gyp. 2013-07-01 15:21:56 +08:00
Cheng Zhao
b9c7013469 Update to latest brightray. 2013-06-27 18:27:51 +08:00
Cheng Zhao
6bb3f1bba8 Merge branch 'master' into python
Conflicts:
	script/update
2013-06-22 07:55:51 +08:00
Cheng Zhao
354a1c555b Update node to v0.10.12. 2013-06-21 12:28:23 +08:00
Cheng Zhao
e3803bc499 Update brightray: fix linking with libchromiumcontent. 2013-06-19 22:54:40 +08:00
Cheng Zhao
a8eaaf9739 Update libchromiumcontent, fixed #22. 2013-06-19 10:52:18 +08:00
Cheng Zhao
93bd97942f Update to latest brightray and libchromiumcontent. 2013-06-10 15:27:09 +08:00
Cheng Zhao
dfa5257ce0 Update to latest chromium and brightray. 2013-06-02 00:26:24 +08:00
Cheng Zhao
bdf12ddf3e Update node to v0.10.9. 2013-06-01 01:10:39 +08:00
Cheng Zhao
9cf890bb61 Add BrowserWindow.restart() to restart renderer process. 2013-05-28 16:22:29 +08:00
Cheng Zhao
f3a8a0741c Use the new way of reporting exception in node context.
More on this can be found at:
3c0fc7ad9f
2013-05-23 13:49:13 +08:00
Cheng Zhao
d265121ed0 Force running uv loop under a handle scope. Fixed #13. 2013-05-22 09:13:32 +08:00
Cheng Zhao
d356be9c54 Update node: remove Atom.app/Contents/Resources/app from node paths.
Fixed #6.
2013-05-17 18:30:45 +08:00
Cheng Zhao
a7052292e6 Update node: add Atom.app/Contents/Resources/app to module paths. 2013-05-13 18:45:17 +08:00
Cheng Zhao
1a2637e2cc Update node: cleanup unused hacks. 2013-05-12 16:18:12 +08:00
Cheng Zhao
ebac5f9ed5 Ship the custom node binary build with atom-shell.
This is required by the child_process.fork, which is indeed executing
the node binary to start a script.

The node fork can be found at:
https://github.com/atom/cefode-node/tree/chromium-v8
2013-05-11 21:07:03 +08:00
Cheng Zhao
ed576dcc68 Update to lastest brightray. 2013-05-07 12:06:54 +08:00
Cheng Zhao
afe07521c5 Correctly handle window's lifetime when it's closed. 2013-05-01 23:28:01 +08:00
Cheng Zhao
de94e4f37e Update to newest brightray. 2013-04-30 18:59:07 +08:00
Cheng Zhao
d723173bc7 Initial RPC API implementation.
Basic usage is:
remote = require 'remote'
Window = remote.require 'window'
w = new Window { width: 800, height: 600 }

Still need to do:
* Beter support for Array type.
* Remote objects should cheat devtools.
* Support cross-process callbacks.
2013-04-24 16:43:01 +08:00
Cheng Zhao
66a0abe799 Renderer can now use process.send to send messages to browser. 2013-04-22 21:32:48 +08:00
Cheng Zhao
3ae0c99ca9 Add the RemoteObject API in renderer. (not implemented yet) 2013-04-22 09:13:25 +08:00
Cheng Zhao
5fb5ce2251 Enable creating window with existing web contents. 2013-04-20 13:42:39 +08:00
Cheng Zhao
603ae8b62e Update to latest brightray. 2013-04-19 19:11:46 +08:00
Cheng Zhao
df50cc08d6 Expose interface of NativeWindow in javascript. 2013-04-17 22:49:49 +08:00
Cheng Zhao
60528e53ee Use JavaScript to open the main window. 2013-04-17 20:05:43 +08:00
Cheng Zhao
a7516f3da5 Copy the default_app to bundle. 2013-04-14 23:24:46 +08:00
Cheng Zhao
ad708fdfbd Add script to check coding styles. 2013-04-14 17:34:51 +08:00
Cheng Zhao
c6e62dcffd Use node's error reporting system in browser. 2013-04-13 23:38:13 +08:00
Cheng Zhao
40307126d7 Load atom.js on startup. 2013-04-13 21:10:41 +08:00
Cheng Zhao
f853fc3df5 Initialize node in browser process. 2013-04-13 18:39:09 +08:00
Cheng Zhao
cb2116f725 Give URL of my libchromiumcontent build. 2013-04-12 23:11:18 +08:00
Cheng Zhao
939b695675 Build with node. 2013-04-12 22:52:32 +08:00
Cheng Zhao
26d6df7852 Handle keyboard events with AtomEventProcessingWindow.
Some system events like cmd+` will be handled by it automatically.
2013-04-12 20:31:15 +08:00
Cheng Zhao
6ef8875b1e Add submodules. 2013-04-11 20:38:29 +08:00