Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
- Loading branch information
1 parent
da6996d
commit 5c3d6aa
Showing
16 changed files
with
300 additions
and
304 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
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
37 changes: 37 additions & 0 deletions
37
patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
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,37 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Marek Rusinowski <marekrusinowski@gmail.com> | ||
Date: Wed, 23 Mar 2022 21:09:37 +0100 | ||
Subject: introduce OzonePlatform::electron_can_call_x11 property | ||
|
||
We expose this additonal property in the OzonePlatform to be able to easily | ||
determine whatever we can call X11 functions without crashing the application | ||
at rutime. It would be best if eventually all usages of this property were | ||
replaced with clean ozone native implementations. | ||
|
||
diff --git a/ui/ozone/platform/x11/ozone_platform_x11.cc b/ui/ozone/platform/x11/ozone_platform_x11.cc | ||
index 9008af973427d7dab8170449bc5767cebc9d2e9e..e312287e4aca61b51a69c8413088f56f9f704b5e 100644 | ||
--- a/ui/ozone/platform/x11/ozone_platform_x11.cc | ||
+++ b/ui/ozone/platform/x11/ozone_platform_x11.cc | ||
@@ -200,6 +200,7 @@ class OzonePlatformX11 : public OzonePlatform, | ||
properties->supports_vulkan_swap_chain = true; | ||
properties->uses_external_vulkan_image_factory = true; | ||
properties->skia_can_fall_back_to_x11 = true; | ||
+ properties->electron_can_call_x11 = true; | ||
properties->platform_shows_drag_image = false; | ||
properties->supports_global_application_menus = true; | ||
properties->app_modal_dialogs_use_event_blocker = true; | ||
diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h | ||
index 22ba32317a74df24249d1528dcaaa28ff18bd0f4..fa57f97520a0327be2c7f5179591ca61b801c8b0 100644 | ||
--- a/ui/ozone/public/ozone_platform.h | ||
+++ b/ui/ozone/public/ozone_platform.h | ||
@@ -132,6 +132,10 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { | ||
// Linux only: determines if Skia can fall back to the X11 output device. | ||
bool skia_can_fall_back_to_x11 = false; | ||
|
||
+ // Linux only: determines is Electron can call selected X11 functions while | ||
+ // it migrates to pure ozone abstractions. | ||
+ bool electron_can_call_x11 = false; | ||
+ | ||
// Wayland only: determines whether windows which are not top level ones | ||
// should be given parents explicitly. | ||
bool set_parent_for_non_top_level_windows = false; |
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
Oops, something went wrong.