Граф коммитов

1697 Коммитов

Автор SHA1 Сообщение Дата
John Kleinschmidt 3122dcbb78
Merge pull request #756 from electron/move-mac-to-circle-2-0-x
ci: Move MacOS builds to CircleCI (2-0-x)
2019-03-13 19:32:27 -04:00
John Kleinschmidt 650da9e566 Removed bad reference to sccache 2019-03-12 15:41:51 -04:00
John Kleinschmidt f954d64792 Remove unsupported params 2019-03-12 12:59:05 -04:00
John Kleinschmidt 69133d5889 Remove unneeded vsts.yml 2019-03-12 10:55:54 -04:00
John Kleinschmidt 995180d195 ci: move MacOS builds to CircleCI 2019-03-12 10:51:05 -04:00
Robo 1f6a271a1a FileReader: Make a copy of the ArrayBuffer when returning partial results. (#750)
https://chromium-review.googlesource.com/c/chromium/src/+/1492873
2019-03-07 09:27:25 -08:00
Charles Kerr daf9bdcdfd
fix: Magellan sqlite security issue (#740)
* Revert "restore accidentally-removed patch"

This reverts commit efa6c4c587.

* Revert "remove duplicate changes"

This reverts commit 88a5ee3ada.

* Revert "fix omitted changes"

This reverts commit 2f4bff3109.

* Revert "fix: update more api under //sql for 3.26 (3-0-x)"

This reverts commit 794df100d9.

* Revert "build: Upgrade //third_party/sqlite from 3.20.0 to 3.26.0 (#733)"

This reverts commit 0cc7c93746.

* Use upstream SQLite's Magellan security fixes.

https://www.sqlite.org/src/vinfo/d44318f59044162e

* fix tyop
2018-12-17 16:33:24 -06:00
John Kleinschmidt 30f4e25557
Merge pull request #739 from electron/fix_sqlite_2_0_x
fix: update more api under //sql for 3.26 (2-0-x)
2018-12-17 08:37:11 -05:00
Charles Kerr efa6c4c587 restore accidentally-removed patch 2018-12-16 14:04:35 -06:00
Charles Kerr 88a5ee3ada remove duplicate changes
The changes to  are already present in
2018-12-16 14:00:08 -06:00
Charles Kerr 2f4bff3109 fix omitted changes
add internal_api_token.h include and chrome_sqlite3_recoverVtableInit
2018-12-16 13:56:57 -06:00
Charles Kerr 794df100d9 fix: update more api under //sql for 3.26 (3-0-x)
This is a backport PR similar to the 3-0-x and 3-0-x PRs
https://github.com/electron/libchromiumcontent/pull/736 and
https://github.com/electron/libchromiumcontent/pull/737.

One difference: the upstream patch to remove auto-vacuum at
https://chromium-review.googlesource.com/c/chromium/src/+/1362222
was problematic to backport to 2-0-x, and its PR description says
"no functional changes are expected, because the patch is inert
in production", so I've omitted it here.
2018-12-16 13:08:35 -06:00
Robo 0cc7c93746 build: Upgrade //third_party/sqlite from 3.20.0 to 3.26.0 (#733)
Backports https://chromium-review.googlesource.com/c/chromium/src/+/1352694
2018-12-13 11:27:58 -08:00
Milan Burda e90608c237 fix: checkboxes not rendering in mojave (backport: 2-0-x) (#730) 2018-12-12 19:32:28 +01:00
Cheng Zhao ebe1313308
Merge pull request #707 from electron/fix-trackpad-scrolling-2-0-x
fix: backport patch to fix scrolling problem (2-0-x)
2018-12-04 20:11:42 +09:00
John Kleinschmidt 733be8c784 S3Upload was in there twice 2018-12-04 15:32:02 +09:00
Cheng Zhao 3c6f864111 fix: backport patch to fix scrolling problem 2018-11-27 09:38:26 +09:00
Charles Kerr ccdb085454 Merge remote-tracking branch 'origin/promise-all-closure-2-0-x' into electron-2-0-x 2018-10-16 15:26:55 -05:00
Cheng Zhao 5d0f8f9df1 fix: add a node_integration field to WebPreferences (#695) 2018-10-11 08:55:11 -05:00
Samuel Attard 1c10dbac1b chore: add patch for Promise.all closure 2018-10-11 14:39:41 +11:00
Shelley Vohr e271f9ba29
expose libgtkui::GetBgColor (#691) 2018-09-27 08:25:26 -07:00
Robo cbd04c0dcc fix: Skip network adapters that are not in state IfOperStatusUp when probing for WPAD via DHCP (backport: 2-0-x) (#686)
Backports https://chromium-review.googlesource.com/c/chromium/src/+/946870
2018-09-17 16:07:07 -05:00
John Kleinschmidt 09483806e9
Merge pull request #643 from electron/roll-clang
chore: roll clang 307486:308728
2018-08-16 10:29:01 -07:00
Jeremy Apthorp 657a0c8448 chore: roll clang 307486-1:308728-3
See upstream:

https://chromium-review.googlesource.com/c/chromium/src/+/582074

We don't need any of the other changes from that CL, because they're all
fuchsia- or iOS-only.

Ref electron/electron#13988
2018-08-09 15:35:31 -07:00
Jeremy Apthorp 028b0af830 fix: backport MAS api removal to 2-0-x 2018-08-07 14:56:46 -07:00
Jeremy Apthorp db83a09ae0 fix: [mas] backport 9db3077 to remove private API usage 2018-08-07 11:23:13 -07:00
Jamie Wong 284e6d6ef2 fix: Backport "Use unverified sync token in WebGL's DrawingBuffer." (#627) 2018-08-02 14:06:38 -05:00
Birunthan Mohanathas 5caba227fd fix: Backport "Enforce flush ordering between contexts in GPU process on macOS" (2-0-x) (#624)
This is a backport of
https://chromium-review.googlesource.com/c/chromium/src/+/687832
targeting the 2-0-x branch of Electron.

This is a crucial patch for Figma, since without it mac users will see
flickering when their GPU is under heavy load.
2018-07-31 12:25:08 -05:00
Zeke Sikelianos 1df280f978
Merge pull request #619 from electron/fix-onsizeconstraintschanged-crash-2-0-x
fix: Backport patch to fix Widget::OnSizeConstraintsChanged crash (2.0.x)
2018-07-26 09:11:51 -07:00
Birunthan Mohanathas 9f9a38b28d fix: Backport patch to fix Widget::OnSizeConstraintsChanged crash (2.0.x)
This backports #617 to 2.0.x.
2018-07-26 09:53:33 +02:00
Cheng Zhao ed866a0c42
Merge pull request #595 from electron/proxy_resolver_oop
build: ship mojo v8 proxy resolver
2018-07-12 20:18:27 +09:00
deepak1556 0f50f5e3b3 add target for component build 2018-07-12 16:40:43 +09:00
deepak1556 9a25d5f035 build: ship mojo v8 proxy resolver 2018-07-12 16:40:43 +09:00
Cheng Zhao c6d501936d
Merge pull request #596 from electron/appveyor-2-0-x
Use Visual Studio for 2-0-x
2018-07-12 16:39:41 +09:00
John Kleinschmidt f5f36fb762 Only build native_mksnapshot for arm and arm64
(cherry picked from commit 8e0f3981e5)
2018-07-10 16:29:25 -04:00
John Kleinschmidt b1b23a697b Use VS2015 for 2-0-x (and older) 2018-07-10 12:12:06 -04:00
John Kleinschmidt 7878d31379
Merge pull request #582 from electron/backport-windwmfix
adds patch to allow disabling redraw locking on windows
2018-07-02 11:28:16 -04:00
Heilig Benedek dd61a4ec94 adds patch to allow disabling redraw locking on windows 2018-06-29 11:55:03 -07:00
John Kleinschmidt 2497c772f2
Merge pull request #574 from electron/update-vsts-2-0-x
Use new VSTS config from master
2018-06-21 13:42:02 -04:00
John Kleinschmidt 4220bf3b1b Use new VSTS config from master
This allows us to break up VSTS builds
2018-06-21 09:12:31 -04:00
Milan Burda 85a8281f05 Fix patches/086-backport-f0c82253.patch (#565) 2018-06-20 07:42:17 -05:00
Alexey Kuzmin 14ff5b517d backport: VP9 temporal index bounds check (#562) 2018-06-19 10:25:10 -05:00
Milan Burda 0c1b70558d Backport "Allow lookup of videodecoder service to fix HW video decoding on macOS 10.13" (#558)
https://chromium-review.googlesource.com/677290
2018-06-15 14:41:40 -05:00
Andrew MacDonald 663e747b6c
Merge pull request #546 from electron/ajm-fix-patch-extension
Fix patch file extension.
2018-05-19 00:52:22 -07:00
Andrew MacDonald 81d06067b2 Fix patch file extension. 2018-05-18 14:19:26 -07:00
Andrew MacDonald 0e76062883 Add a patch to fix long jitter buffer delays with Opus and DTX. (#533) 2018-05-01 20:55:25 -05:00
John Kleinschmidt 66be4ccb73
Merge pull request #524 from electron/fix-mac-static-2-0-x
Fix mac static builds for 2-0-x
2018-04-18 15:52:25 -04:00
John Kleinschmidt f6b90769db Static builds were accidentally building the shared library instead
(cherry picked from commit b9a74d0dbe)
2018-04-18 11:59:38 -04:00
John Kleinschmidt 00279ff2eb
Merge pull request #520 from electron/vsts-2-0-x
Backport VSTS configuration to 2-0-x
2018-04-17 14:08:44 -04:00
Alexey Kuzmin ca1e1352cd Backport a couple of sandbox fixes from Chromium (#519)
* Backport "[Windows Sandbox] Possible short/8.3 form native file paths prevent startup."

https://chromium-review.googlesource.com/580629
Landed in 62.0.3181.0.

* Backport "Reimplemented GetProcessBaseAddress"

https://chromium-review.googlesource.com/608702
Landed in 62.0.3187.0.
2018-04-17 11:44:34 -05:00