Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: cf5a4640f5
Branches Tags
electron
/
patches
/
chromium
/
introduce_ozoneplatform_electron_can_call_x11_property.patch

introduce_ozoneplatform_electron_can_call_x11_property.patch 2.0 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Marek Rusinowski <[email protected]>
    3. 

  3. Date: Wed, 23 Mar 2022 21:09:37 +0100
    4. 

  4. Subject: introduce OzonePlatform::electron_can_call_x11 property
    5. 

  5. 

  6. We expose this additonal property in the OzonePlatform to be able to easily
    7. 

  7. determine whatever we can call X11 functions without crashing the application
    8. 

  8. at rutime. It would be best if eventually all usages of this property were
    9. 

  9. replaced with clean ozone native implementations.
    10. 

  10. 

  11. diff --git a/ui/ozone/platform/x11/ozone_platform_x11.cc b/ui/ozone/platform/x11/ozone_platform_x11.cc
    12. 

  12. index bc8ac7431f25d1fd6f026f8049d589cba01fa6fd..1bb0c95acf2df61975b1cc6423eb8514bb3488e4 100644
    13. 

  13. --- a/ui/ozone/platform/x11/ozone_platform_x11.cc
    14. 

  14. +++ b/ui/ozone/platform/x11/ozone_platform_x11.cc
    15. 

  15. @@ -192,6 +192,7 @@ class OzonePlatformX11 : public OzonePlatform,
    16. 

  16.            base::MessagePumpType::UI;
    17. 

  17.        properties->supports_vulkan_swap_chain = true;
    18. 

  18.        properties->skia_can_fall_back_to_x11 = true;
    19. 

  19. +      properties->electron_can_call_x11 = true;
    20. 

  20.        properties->platform_shows_drag_image = false;
    21. 

  21.        properties->supports_global_application_menus = true;
    22. 

  22.        properties->app_modal_dialogs_use_event_blocker = true;
    23. 

  23. diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h
    24. 

  24. index 78e83ecd9bf73cbc8d9c1d697f022f9f1f0f1d66..8ca1b1451b5bea0100a723e327762d16622c76fe 100644
    25. 

  25. --- a/ui/ozone/public/ozone_platform.h
    26. 

  26. +++ b/ui/ozone/public/ozone_platform.h
    27. 

  27. @@ -128,6 +128,10 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
    28. 

  28.      // Linux only: determines if Skia can fall back to the X11 output device.
    29. 

  29.      bool skia_can_fall_back_to_x11 = false;
    30. 

  30.  
    31. 

  31. +    // Linux only: determines is Electron can call selected X11 functions while
    32. 

  32. +    // it migrates to pure ozone abstractions.
    33. 

  33. +    bool electron_can_call_x11 = false;
    34. 

  34. +
    35. 

  35.      // Wayland only: determines whether windows which are not top level ones
    36. 

  36.      // should be given parents explicitly.
    37. 

  37.      bool set_parent_for_non_top_level_windows = false;
    38.