-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changelog: - https://github.com/electron/electron/releases/tag/v33.1.0 - https://github.com/electron/electron/releases/tag/v33.2.0
- Loading branch information
Showing
27 changed files
with
151 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
ELECTRON_VER= 33.0.2 | ||
ELECTRON_VER= 33.2.0 | ||
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- .gn.orig 2024-11-11 11:08:19 UTC | ||
+++ .gn | ||
@@ -173,6 +173,8 @@ exec_script_whitelist = | ||
"//tools/grit/grit_rule.gni", | ||
"//tools/gritsettings/BUILD.gn", | ||
|
||
+ "//third_party/icu/BUILD.gn", | ||
+ | ||
"//electron/BUILD.gn", | ||
"//third_party/electron_node/deps/base64/BUILD.gn", | ||
"//third_party/electron_node/deps/base64/unofficial.gni", |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
devel/electron33/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
...h-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 3 additions & 4 deletions
7
...ectron33/files/patch-components_media__router_common_providers_cast_channel_enum__table.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,15 @@ | ||
--- components/media_router/common/providers/cast/channel/enum_table.h.orig 2024-10-16 21:31:11 UTC | ||
--- components/media_router/common/providers/cast/channel/enum_table.h.orig 2024-11-09 21:36:44 UTC | ||
+++ components/media_router/common/providers/cast/channel/enum_table.h | ||
@@ -368,7 +368,12 @@ class EnumTable { | ||
|
||
private: | ||
#ifdef ARCH_CPU_64_BITS | ||
- alignas(std::hardware_destructive_interference_size) | ||
+#ifdef __cpp_lib_hardware_interference_size | ||
+ using std::hardware_destructive_interference_size; | ||
alignas(std::hardware_destructive_interference_size) | ||
+#else | ||
+ static constexpr std::size_t hardware_destructive_interference_size = 64; | ||
+#endif | ||
+ alignas(hardware_destructive_interference_size) | ||
+#endif | ||
#endif | ||
std::initializer_list<Entry> data_; | ||
bool is_sorted_; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
devel/electron33/files/patch-electron_shell_browser_osr_osr__host__display__client.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
devel/electron33/files/patch-electron_shell_browser_osr_osr__paint__event.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- electron/shell/browser/osr/osr_paint_event.h.orig 2024-11-11 11:23:02 UTC | ||
+++ electron/shell/browser/osr/osr_paint_event.h | ||
@@ -96,7 +96,7 @@ struct OffscreenSharedTextureValue { | ||
// On Windows it is a HANDLE to the shared D3D11 texture. | ||
// On macOS it is a IOSurface* to the shared IOSurface. | ||
uintptr_t shared_texture_handle; | ||
-#elif BUILDFLAG(IS_LINUX) | ||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) | ||
std::vector<OffscreenNativePixmapPlaneInfo> planes; | ||
uint64_t modifier; | ||
#endif |
11 changes: 11 additions & 0 deletions
11
devel/electron33/files/patch-electron_shell_browser_osr_osr__video__consumer.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- electron/shell/browser/osr/osr_video_consumer.cc.orig 2024-11-11 11:24:27 UTC | ||
+++ electron/shell/browser/osr/osr_video_consumer.cc | ||
@@ -103,7 +103,7 @@ void OffScreenVideoConsumer::OnFrameCaptured( | ||
#elif BUILDFLAG(IS_APPLE) | ||
texture.shared_texture_handle = | ||
reinterpret_cast<uintptr_t>(gmb_handle.io_surface.get()); | ||
-#elif BUILDFLAG(IS_LINUX) | ||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) | ||
const auto& native_pixmap = gmb_handle.native_pixmap_handle; | ||
texture.modifier = native_pixmap.modifier; | ||
for (const auto& plane : native_pixmap.planes) { |
11 changes: 11 additions & 0 deletions
11
devel/electron33/files/patch-electron_shell_common_gin__converters_osr__converter.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- electron/shell/common/gin_converters/osr_converter.cc.orig 2024-11-11 11:25:17 UTC | ||
+++ electron/shell/common/gin_converters/osr_converter.cc | ||
@@ -118,7 +118,7 @@ v8::Local<v8::Value> Converter<electron::OffscreenShar | ||
const_cast<uintptr_t*>(&val.shared_texture_handle)), | ||
sizeof(val.shared_texture_handle)); | ||
dict.Set("sharedTextureHandle", handle_buf.ToLocalChecked()); | ||
-#elif BUILDFLAG(IS_LINUX) | ||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) | ||
auto v8_planes = base::ToVector(val.planes, [isolate](const auto& plane) { | ||
gin::Dictionary v8_plane(isolate, v8::Object::New(isolate)); | ||
v8_plane.Set("stride", plane.stride); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
devel/electron33/files/patch-electron_spec_api-protocol-spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
--- electron/spec/api-protocol-spec.ts.orig 2024-10-09 13:53:06 UTC | ||
--- electron/spec/api-protocol-spec.ts.orig 2024-11-07 16:14:43 UTC | ||
+++ electron/spec/api-protocol-spec.ts | ||
@@ -1737,7 +1737,7 @@ describe('protocol module', () => { | ||
}); | ||
@@ -1738,7 +1738,7 @@ describe('protocol module', () => { | ||
|
||
// TODO(nornagon): this test doesn't pass on Linux currently, investigate. | ||
- ifit(process.platform !== 'linux')('is fast', async () => { | ||
+ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('is fast', async () => { | ||
// test is also flaky on CI on macOS so it is currently disabled there as well. | ||
- ifit(process.platform !== 'linux' && (!process.env.CI || process.platform !== 'darwin'))('is fast', async () => { | ||
+ ifit((process.platform !== 'linux' && process.platform !== 'freebsd') && (!process.env.CI || process.platform !== 'darwin'))('is fast', async () => { | ||
// 128 MB of spaces. | ||
const chunk = new Uint8Array(128 * 1024 * 1024); | ||
chunk.fill(' '.charCodeAt(0)); |
4 changes: 2 additions & 2 deletions
4
devel/electron33/files/patch-electron_spec_api-web-frame-main-spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.