mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
23478 commits 1 branch 183 tags 5.3 GiB
Commit graph

380 commits

Author SHA1 Message Date
renaesop
26135b412b Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	atom/browser/api/atom_api_web_contents.cc
#	chromium_src/chrome/browser/printing/print_job_worker.cc
#	chromium_src/chrome/browser/printing/print_job_worker.h
#	chromium_src/chrome/browser/printing/print_view_manager_base.cc
#	chromium_src/chrome/browser/printing/print_view_manager_base.h
#	chromium_src/chrome/browser/printing/printer_query.cc
#	chromium_src/chrome/common/print_messages.cc
#	chromium_src/chrome/renderer/printing/print_web_view_helper.cc
 2017-02-07 09:30:36 +08:00
Cheng Zhao
864a23f72b Fix print() not working 2017-02-06 10:34:30 -08:00
Cheng Zhao
1ed8743da8 Update Windows printing code to latest 2017-02-06 10:34:29 -08:00
Cheng Zhao
d483352f78 Fix PrintToPDF not receiving results 2017-02-06 10:34:29 -08:00
Cheng Zhao
ab783413a2 Update printing code to latest 2017-02-06 10:34:29 -08:00
Cheng Zhao
75627ba6ad Fix sync printing not working 2017-02-06 10:34:29 -08:00
Cheng Zhao
55d4d44f02 Fix Debug building on Windows 2017-02-06 10:34:29 -08:00
Cheng Zhao
fa4b8cff45 Fix error due to search for openssl headers 2017-02-06 10:34:29 -08:00
Cheng Zhao
eb3b77f43b ScopedTempDir::path is replaced with GetPath 2017-02-06 10:34:29 -08:00
Cheng Zhao
6763977316 Update URLPattern to its latest version 2017-02-06 10:34:29 -08:00
Cheng Zhao
81784827ff PrintWebViewHelper is attached to RenderFrame 2017-02-06 10:34:29 -08:00
Cheng Zhao
5162905fe4 Update widevine_cdm_messages.h 2017-02-06 10:34:29 -08:00
Cheng Zhao
13a1d79ca6 Deperecate AtomSecurityStateModelClient with SecurityStateTabHelper 2017-02-06 10:34:28 -08:00
Cheng Zhao
d4e3dade39 WindowCapturer and ScreenCapturer are merged to DesktopCapturer 2017-02-06 10:34:28 -08:00
Cheng Zhao
406224edff enable_pepper_cdms is now a feature flag 
So we should not define it anymore.
 2017-02-06 10:34:28 -08:00
renaesop
023a3fd547 Print enhancement: add webContents.printerList And a print option to select printer 2017-02-06 17:18:04 +08:00
Cheng Zhao
6e0762a540 Fix building on Windows 2017-01-19 09:05:59 +02:00
Cheng Zhao
497f5a1199 Update files for Chrome 54 API changes 2017-01-19 09:05:59 +02:00
Czipperz
e4688f1c5a Reorder BrowserProcess constructor to avoid invalid memory 2017-01-12 16:55:26 -08:00
Paul Betts
7dd1ebc734 Fix oops typos 2016-10-11 14:02:29 -07:00
Paul Betts
06065d1c5d Instead of gating the path shortening to MAS_BUILD, figure it out at runtime 2016-10-11 13:06:29 -07:00
Paul Betts
e84ae6e2aa Add a method to determine whether we're in the Apple sandbox 2016-10-11 13:06:29 -07:00
Vadim Macagon
7c5d3296e7 Prevent undefined behavior when some Node Buffer objects are destroyed 
If node::Buffer::New() is used to wrap an existing chunk of memory
without providing a custom callback to release that memory then Node
will just use `free()`. In a couple of places Node buffer objects were
constructed from chunks of memory that were allocated with `new[]`, but
a custom callback to release that memory was omitted, this resulted in
undefined behavior when those buffers were destroyed because `free()`
was used to release memory allocated with `new[]`.

To avoid undefined behavior the aforementioned buffer objects are now
constructed with a custom callback that safely releases the underlying
chunk of memory.
 2016-10-03 10:26:26 +07:00
Cheng Zhao
6d8f900916 Fix building on Windows 2016-09-14 16:22:43 +09:00
Cheng Zhao
4aa292c7cd Fix building on Linux 2016-09-14 16:22:43 +09:00
Cheng Zhao
f28e8d7168 Fix API changes of Chrome 53 2016-09-14 16:22:43 +09:00
Hanae Kae
6ea5e50179 Japanese font rendering in flash. 2016-08-29 16:02:09 +09:00
Brian R. Bondy
95d5de1444 Fix printing on Windows when sandbox is enabled 
Auditors:  @bridiver

This makes it closer to how it works in Chromium and fixes the forever spooling problem on Windows.

The old way worked when the sandbox was disabled but failed on the call for shared_buf.CreateAndMapAnonymous when the sandbox was enabled

This also fixes a handle leak which Chromium already had fixed.
 2016-08-07 10:46:08 -04:00
Cheng Zhao
b57665330c Merge branch 'master' into chrome52 2016-07-21 05:34:36 -06:00
Haojian Wu
59e44c13e0 Remove unused using decls. 2016-07-09 22:23:57 +02:00
Cheng Zhao
381689d3ed Fix building on Windows 2016-07-05 09:31:29 +09:00
Cheng Zhao
48f819f337 Do not use home cooked SkUserConfig.h 2016-07-04 15:32:43 +09:00
Cheng Zhao
1ba3907038 Update to API changes of Chrome 52 2016-07-04 15:32:43 +09:00
Cheng Zhao
44651656dd Fix building on Windows 2016-05-23 16:39:19 +09:00
Cheng Zhao
a2bd55dd3c Adapt to changes of Chrome 51 API changes (Part 2) 2016-05-23 12:29:14 +09:00
Cheng Zhao
9ccb495f60 Do not remove the patch for Command key 2016-05-13 11:11:50 +09:00
Brian R. Bondy
a52dbf0784 Update SharedMemory buf constructor 2016-05-13 11:07:17 +09:00
Brian R. Bondy
900001e547 Update PlatformCanvas to SKCanvas 2016-05-13 11:07:17 +09:00
Brian R. Bondy
37ccd34a88 Update x11 global shortcut listeners 2016-05-13 11:07:17 +09:00
Brian R. Bondy
0253aec0cd Add SkUserConfig.h with blank SkDebugf macro 
This file was copied from:
./third_party/skia/include/config/SkUserConfig.h

But because of this linking error we needed to
define a macro for SkDebugf.

```
"SkDebugf(char const*, ...)", referenced from:
      SkBitmap::allocPixels(SkImageInfo const&, unsigned long) in
      libbrave_lib.a(brave_lib.native_desktop_media_list.o)
      ld: symbol(s) not found for architecture x86_64
```

There used to be a hack to copy this file here which was removed:
8de9d9e2bc
 2016-05-13 11:07:17 +09:00
Brian R. Bondy
ce7c1023d5 Minimum fixes needed for chromium_src 2016-05-13 11:07:17 +09:00
Brian R. Bondy
2da39d31aa Update to new pref service location in components 2016-05-13 11:07:17 +09:00
Cheng Zhao
4435cdc576 Create user_data_dir before creating singleton lock 2016-04-27 21:52:50 +09:00
Cheng Zhao
0900762507 Make the length of SingletonSocket's path as short as we can 2016-04-21 13:58:11 +09:00
deepak1556
1240c83e40 set trust bits for CA certs 2016-04-18 21:05:33 +05:30
deepak1556
e81cec4058 app: api to import client certificate 2016-04-18 10:54:43 +05:30
Cheng Zhao
ae0d007c5e Do no load PDF library from DLL 
We already have them compiled in.
 2016-04-14 17:15:20 +09:00
Robo
cdc7b8d15e devtools: fix filesyatem api usage and use prefs to track filesystem paths 2016-03-15 07:51:36 +05:30
Cheng Zhao
cadd1969d9 Fix compilation errors on Windows 2016-03-10 17:06:23 +09:00
Paul Betts
e3af5de7d7 Update pdf_to_emf_converter 2016-03-10 17:06:23 +09:00
Paul Betts
f4ec369873 More boring fixups 2016-03-10 17:06:22 +09:00
Paul Betts
7b60ef6261 SetIsDraftMode no longer a thing, see https://groups.google.com/a/chromium.org/forum/m/#!topic/chromium-checkins/6qohfKmEYyg 2016-03-10 17:06:22 +09:00
Paul Betts
e835111195 More type fixups 2016-03-10 17:06:22 +09:00
Paul Betts
a737baafbf We don't need Metro 2016-03-10 17:06:22 +09:00
Cheng Zhao
d36b8bca86 Fix compilation errors on Linux 2016-03-10 17:06:22 +09:00
Cheng Zhao
044daee086 Update printing code to latest 2016-03-10 17:06:22 +09:00
Cheng Zhao
5fae63a2f5 Fix compilation errors on OS X 2016-03-10 17:06:21 +09:00
Dongjoon Hyun
0c92d44077 Fix typos in comments. 2016-03-07 20:22:03 -08:00
Cheng Zhao
57da8908b2 Use volume serial number as device id 2016-01-12 23:17:07 +08:00
Cheng Zhao
8832d7b77b Import PepperFlashDRMHost class 2016-01-12 22:17:24 +08:00
Cheng Zhao
da52017d82 Revert "fix chrome app and user path conflicts" 
This reverts commit 25aaafde45bd3ac7d9a82184f67b79874da73aa8.
 2016-01-11 10:30:17 +08:00
Cheng Zhao
c5238bb8f0 Update brightray and libchromiumcontent with widevine support 2015-12-30 11:45:39 +08:00
Cheng Zhao
c76db0ba1d Fix coding styles 2015-12-29 18:59:27 +08:00
Cyrille Lebeaupin
9d878ad6b2 Add widevine third party 
Add 2 new command options to use widevine:
- widevine-cdm-path: Path to widevine plugin
- widevine-cdm-version: Version of the widevine plugin
 2015-12-29 14:50:59 +08:00
Robo
658accab94 fix pointer usage 2015-12-11 00:25:25 +05:30
Robo
29f32c5ec7 support filtering event with url regex 2015-12-09 20:14:18 +05:30
Robo
f77bb44952 fix chrome app and user path conflicts 2015-12-08 23:00:08 +05:30
Cheng Zhao
836a8b1794 Simplify the desktopCapturer code 2015-12-08 13:49:26 +08:00
Cheng Zhao
51368952a2 Remove deprecated API usages 2015-12-08 12:58:39 +08:00
Cheng Zhao
04f7ceab73 Merge branch 'master' into desktop-capture-api 2015-12-08 12:43:44 +08:00
Cheng Zhao
c3f7f2447c Update the libspeechd_loader 2015-12-08 10:26:32 +08:00
Cheng Zhao
e8b5a6dedf Merge pull request #3718 from atom/chrome47-linux 
Port Chrome47 on Linux
 2015-12-08 10:14:27 +08:00
Cheng Zhao
e78a02806e Make it safe to use sendSync 2015-12-08 10:07:47 +08:00
Paul Betts
9a0cecf943 Rig GlobalMenuBarRegistrarX11 for Atom 2015-12-07 14:30:26 -08:00
Paul Betts
fe86239a9c Update to Chrome47 version of tts_linux 2015-12-07 14:28:42 -08:00
Paul Betts
4a8d58f914 Update to Chrome47 version of GlobalMenuBarRegistrarX11 2015-12-07 14:25:52 -08:00
Paul Betts
8d5c153e9b Update to Chrome 47 version of tts_win 2015-12-07 14:23:01 -08:00
Paul Betts
3931ebb7ef Fix up Windows build errors 2015-12-07 10:02:06 -08:00
Cheng Zhao
73e7773d84 Update to API changes of Chrome 47 2015-12-07 19:56:23 +08:00
Cheng Zhao
fdc19f2d3a Fix building on Windows 2015-11-13 13:23:13 +08:00
Cheng Zhao
05d2e431de Fix building on OS X 2015-11-13 13:03:00 +08:00
Cheng Zhao
83ae9f8d71 Import the chrome_paths code 2015-11-13 12:45:02 +08:00
Cheng Zhao
6bfe06ec4e Pass original argv in callback 2015-10-22 19:02:21 +08:00
Cheng Zhao
d52ef50b01 win: Pass original command line 2015-10-22 17:52:06 +08:00
Cheng Zhao
93a3a946f3 posix: Pass original command line 2015-10-22 17:43:55 +08:00
Cheng Zhao
afc1fff792 Remove the need for ProcessSingletonStartupLock 2015-10-22 17:12:09 +08:00
Cheng Zhao
230f2760e7 linux: Delay creating watcher until message loop is ready 2015-10-22 15:57:37 +08:00
Cheng Zhao
f01e84a418 linux: Delay listening to socket until message loop is ready 2015-10-22 15:54:58 +08:00
Cheng Zhao
310954713f Simplify the usage of singleton 2015-10-22 14:59:12 +08:00
Paul Betts
99c496471b Allow WM_COPYDATA from all processes 2015-10-20 17:36:05 -07:00
Paul Betts
15f00db1bf I don't think we need this 2015-10-20 15:03:59 -07:00
Paul Betts
5886398f22 Port our changes over 2015-10-20 14:24:45 -07:00
Paul Betts
7491d5cfb5 Copy back the original versions of Chromium files in 2015-10-20 14:05:07 -07:00
Haojian Wu
dcb457e76e Refine API design: desktopCapturer.getSources. 2015-10-07 11:10:35 +08:00
Cheng Zhao
8577f2b52f osx: Add NativeWindow::SetSizeConstraints 2015-10-05 20:07:20 +08:00
Haojian Wu
36c0ad7fda Refine more about desktop capturer API. 
* Simplify the coffeescript code.
* Add more options in desktopCapturer.startUpdating.
 2015-10-05 12:47:01 +08:00
Haojian Wu
1e69ef79de Refine: make desktop-capturer as a renderer module. 2015-10-04 22:04:41 +08:00
Haojian Wu
c9fbde321c Implement desktop capture API on OS X. 2015-10-02 19:17:28 +08:00
Cheng Zhao
53b9d61831 Fix building on Windows 2015-09-03 20:07:29 +08:00
Cheng Zhao
45491ca7ab Fix API changes 2015-09-03 17:50:23 +09:00
Cheng Zhao
e043ea9c20 Merge pull request #2677 from atom/fix-more-pages-print 
Fix print spooler hangs when printing more than 3 pages on Windows.
 2015-09-01 19:07:01 +08:00
Haojian Wu
10b53f7f73 Fix print spooler hangs when printing more than 3 pages on Windows. 2015-09-01 17:55:45 +08:00
Cheng Zhao
e7791a5486 Import the TCPListenSocket removed by Chromium 2015-08-27 12:59:54 +08:00
Haojian Wu
11ffb9dfb6 Fix node::Buffer API changes. 2015-08-11 09:48:29 +08:00
Haojian Wu
d08392a0c4 No need base/float_util.h since VS2013 supports well enough. 2015-08-11 09:48:29 +08:00
Haojian Wu
48ccb0f2ab No gfx::SingletonHwnd::Observer any more. 
Using gfx::SingletonHwndObserver instead.
 2015-08-11 09:48:29 +08:00
Haojian Wu
fef53d18c4 Add session.setDownloadPath API. 2015-07-26 16:51:27 +08:00
Haojian Wu
0700f08d6d Copy pref_names files from Chromium. 2015-07-26 16:08:29 +08:00
Cheng Zhao
b1db947def Fix compilation errors due to compiler change 2015-07-01 07:56:29 +00:00
Haojian Wu
16348fc895 Copy pdf data on IO thread to avoid causing main process hangs. 2015-06-16 20:08:30 +08:00
Haojian Wu
57580e00f9 Fix code style. 2015-06-16 20:07:45 +08:00
Haojian Wu
93bbc6c810 Simplify the pdf-data handled code. 2015-06-16 20:07:45 +08:00
Haojian Wu
894f9c0cb0 Don't use duprecated node buffer api, fix build error on OS X. 2015-06-16 20:07:44 +08:00
Haojian Wu
ccbe554ec0 Make callback aligns node.js style. 2015-06-16 20:07:44 +08:00
Haojian Wu
93243ef223 Remove some unused IPC messages. 2015-06-16 20:07:44 +08:00
Haojian Wu
ac62871645 Return node::Buffer as a printToPDF callback result. 2015-06-16 20:07:44 +08:00
Haojian Wu
ab40da3f31 Add silent and savePath options. 2015-06-16 20:07:43 +08:00
Haojian Wu
6e099af5fe Move PDF printing setting in JS part. 2015-06-16 20:07:43 +08:00
Haojian Wu
2597ded985 Cleanup. 2015-06-16 20:02:25 +08:00
Haojian Wu
36fa4da252 Fix Linux compilation error. 2015-06-16 20:02:25 +08:00
Haojian Wu
68005f9ad4 Fix OS X compilation error. 2015-06-16 20:02:25 +08:00
Haojian Wu
600077996c Fix a landscape option error. 2015-06-16 20:02:24 +08:00
Haojian Wu
cef177abc4 Add preview failed error. 2015-06-16 20:02:24 +08:00
Haojian Wu
8572ccb807 Add callback function in printToPDF API. 2015-06-16 20:02:24 +08:00
Haojian Wu
ce8bbb689c Add options to custom print settings in printToPDF API. 2015-06-16 20:02:24 +08:00
Haojian Wu
9cf9229308 Write PDF file in FILE thread. 2015-06-16 20:02:23 +08:00
Haojian Wu
7ffa7042b1 Add printToPDF Implementation. 2015-06-16 20:02:23 +08:00
Cheng Zhao
b97c22d4d7 win: Load pdf.dll with abosolute path, fix #1826 2015-06-01 12:53:43 +08:00
Haojian Wu
5ede62459c Rename PrintHandler to PrintHandlerWin since only used on Windows. 2015-05-23 19:24:29 +08:00
Haojian Wu
abd97a7513 Load pdf component dynamically. 
Ship pdf as dll library, electron only loads pdf.dll when calling print
API. In this way, the developer who don't need print feature can safe
remove the pdf.dll in saving their binary size.
 2015-05-23 19:24:27 +08:00
deepak1556
1c190388e5 flash_drm_host not required 2015-05-10 09:22:09 +05:30
deepak1556
3fdc4543b8 ppapi flash plugin support 2015-05-10 09:22:09 +05:30
Cheng Zhao
95e72c24cc Merge pull request #1532 from hokein/win-print 
Make Print API work on Windows.
 2015-05-10 11:40:19 +08:00
Haojian Wu
0f67b1866a Add Super key support in global-shortcut API. 2015-05-05 22:49:32 +08:00
Haojian Wu
f2853a0b89 Some cleanup. 2015-05-05 21:56:58 +08:00
Haojian Wu
ff87592722 Make Print API work on Windows. 2015-04-30 13:42:08 +08:00
Cheng Zhao
b37c73436b Fix API changes 2015-04-21 18:56:08 +08:00
Cheng Zhao
1b3b2cd402 linux: Don't dynamically load libgio 
It conflicts with statically linked libgio.
 2015-04-08 19:15:48 +08:00
Cheng Zhao
57812616b9 win: Fix tests and compilation errors 2015-03-18 13:58:33 +08:00
Cheng Zhao
105ad369ab linux: Fix compilation error 2015-03-18 09:57:48 +08:00
Cheng Zhao
5b2c0110dc Fix other compilation errors 2015-03-18 09:57:41 +08:00
Cheng Zhao
819ab5cd0c Fix ui/gfx/geometry headers 2015-03-18 09:57:38 +08:00
Cheng Zhao
5c78ecfe40 scoped_ptr.PassAs is removed 2015-01-27 13:18:30 -08:00
Cheng Zhao
43421aedcf OVERRIDE macro is now removed 2015-01-27 13:18:30 -08:00
Cheng Zhao
c6a18b1b59 Split the words before sending it to spellCheck 2014-12-19 20:42:19 -08:00
Cheng Zhao
409f2b4d0f win: Fix compilation errors 2014-12-10 14:17:07 -08:00
Cheng Zhao
22c4911b58 linux: GTK+ status icon has come back 2014-12-09 16:55:01 -08:00
Cheng Zhao
d309fd5a27 Update printing code 2014-12-07 06:55:40 -08:00
Cheng Zhao
89de5b6e9a win: Remove NotifyIconHostStateChanger 
We don't need the ability it provided, and it is causing crashes on some
machines.

Fixes #850.
 2014-11-28 17:47:47 +08:00
Cheng Zhao
914dce6cc2 win: Add color chooser dialog 2014-11-01 13:44:28 +08:00
Cheng Zhao
de49498102 aura: Add color chooser dialog 2014-10-31 23:06:50 +08:00
Cheng Zhao
14c9a2a087 mac: Add color chooser dialog 2014-10-31 22:53:15 +08:00
Cheng Zhao
0d957cc68e Update libgio_loader for some APIs 2014-10-21 19:31:44 +08:00
Cheng Zhao
4b75b10542 Add libgio loader 2014-10-21 18:50:50 +08:00
Cheng Zhao
32dff999a5 Fix API changes of Chrome 38 2014-10-11 19:11:34 +08:00
Cheng Zhao
3a177d55f8 Add linux tts implementation from Chrome 2014-10-08 02:14:12 +00:00
Cheng Zhao
05b602d0ce Import Chrome's tts code 2014-10-07 21:18:44 +08:00
Haojian Wu
d2368d2d3b Add Volume keys support in global-shortcut API, fix #630. 2014-09-09 20:56:47 +08:00
Cheng Zhao
134f8236cc Update printing code to Chrome 37. 2014-09-01 15:35:39 +08:00
Cheng Zhao
d20ec6952a Revert "Move the code of getting printing settings to another class." 
This reverts commit 57d06c5241.

Conflicts:
	atom/browser/printing/printing_config_service.cc
 2014-08-22 15:03:39 +08:00
Cheng Zhao
e43b3309af Add "silent" and "print_background" option for printing. 2014-08-22 15:01:07 +08:00
Cheng Zhao
d0c1b63064 linux: Fix linking error. 2014-08-22 13:03:27 +08:00
Cheng Zhao
57d06c5241 Move the code of getting printing settings to another class. 2014-08-22 12:46:26 +08:00
Cheng Zhao
c9b284d7f7 Remove more unused printing code. 2014-08-22 10:27:08 +08:00
Cheng Zhao
99a510701d Strip out print preview. 2014-08-21 22:14:27 +08:00
Cheng Zhao
eb3ecab6a8 Setup PrintingMessageFilter for printing. 2014-08-21 21:19:43 +08:00
Cheng Zhao
87d5b72b76 Initailize PrintViewManagerBasic for browser window. 2014-08-21 20:49:18 +08:00
Cheng Zhao
c95869e515 Fix cpplint warnings. 2014-08-21 20:25:12 +08:00
Cheng Zhao
cb7196a9c1 Allow script initialized window.print(). 2014-08-21 16:32:41 +08:00
Cheng Zhao
d934526bb3 Add printing related source codes from chrome. 2014-08-21 15:43:11 +08:00
Cheng Zhao
e3eaf909a5 Use the global_shortcut_listener_x11 from chrome36. 
This fixes compilation error on Linux.
 2014-08-04 12:52:42 +00:00
Haojian Wu
035679057e Update GlobalShortcut API design. 
* Rename Shortcut API to GlobalShortcut for better suite.
* Implement the new design interfaces.
* Put the chromium related source code to the same directory as in chrome.
 2014-07-31 20:58:43 +08:00
Haojian Wu
a8034364ff linux: Implement global keyboard shortcut API. 2014-07-31 09:12:42 +08:00
Yeechan Lu
c2c5111d75 win: Implement global keyboard shortcut API. 2014-07-31 09:12:42 +08:00
Haojian Wu
4b3bd9c3cc mac: Implement global keyboard shortcut API. 2014-07-31 09:12:41 +08:00
Cheng Zhao
7e86e53593 linux: Add support for unity global menubar. 2014-07-11 08:57:19 +08:00
Cheng Zhao
3349b8e6c7 linux: Remove all the X and GTK+ related implementations. 
Now we only uses GTK+ for app indicator and status icon, also notice the
in Chrome35 the Gtk2StatusIcon class doesn't exist yet so we shipp
related files under chromium_src, remember to delete them after upgraded
to Chrome36.
 2014-07-10 13:06:41 +08:00
Cheng Zhao
61db17412c Use views to implement NativeWindow and MessageBox on Linux. 2014-07-04 01:30:36 +08:00
Cheng Zhao
c3301a197e Fix including gtk rules in other OSs. 2014-06-29 19:13:49 +08:00
Cheng Zhao
64bf1bcb9f Move all chromium's code under chromium_src. 2014-06-29 06:06:35 +00:00