electron/patches/chromium/mas-cgdisplayusesforcetogray.patch

30 lines
1.2 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <nornagon@nornagon.net>
2018-09-21 00:30:26 +00:00
Date: Thu, 20 Sep 2018 17:49:24 -0700
Subject: mas: avoid usage of CGDisplayUsesForceToGray
2018-09-21 00:30:26 +00:00
Removes usage of the CGDisplayUsesForceToGray private API.
diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm
chore: bump chromium to 120.0.6099.0 (main) (#40316) * chore: bump chromium in DEPS to 120.0.6086.0 * chore: update patches * chore: rename FrameSubscriber::OnNewCropVersion() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4905819 just a simple renaming * chore: rename ToJsTime() to .InMillisecondsFSinceUnixEpoch() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4956111 function renamed upstream * chore: rename ToDoubleT() to .InSecondsFSinceUnixEpoch() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4956111 function renamed upstream * chore: rename FromDoubleT() to .FromSecondsSinceUnixEpoch() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4956111 function renamed upstream * chore: bump chromium in DEPS to 120.0.6088.2 * chore: update patches * chore: regen filenames.libcxx.gni * chore: migrate from (removed upstream) inputFormType to formControlType * chore: bump chromium in DEPS to 120.0.6089.0 * chore: update allow_disabling_blink_scheduler_throttling_per_renderview.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4828507 manually sync to upstream changes + reduce diff size * chore: update patches * chore: bump chromium in DEPS to 120.0.6090.0 * chore: update fix_disabling_background_throttling_in_compositor.patch no manual changes; patch applied with fuzz 2 (4 lines) Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4944206 * chore: update fix_handle_no_top_level_aura_window_in_webcontentsimpl.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4946653 do not patch WebContentsImpl::SetWindowShowState() any longer because it has been removed * chore: update patches * chore: bump chromium in DEPS to 120.0.6091.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6093.0 * chore: bump chromium in DEPS to 120.0.6095.0 * chore: bump chromium in DEPS to 120.0.6096.0 * chore: bump chromium in DEPS to 120.0.6097.0 * chore: update patches * chore: update patch after rebase * 4961495: [document pip] Focus the window when opened manually https://chromium-review.googlesource.com/c/chromium/src/+/4961495 * [Extensions UserScripts] Store extensions with user scripts in tracker | https://chromium-review.googlesource.com/c/chromium/src/+/4950530 * chore: bump chromium in DEPS to 120.0.6099.0 * chore: update patches * chore: update filenames.libcxx.gni * chore: remove trailing space --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
2023-11-01 14:02:12 +00:00
index a771c1c03fd1afe3a5e563b4421721a5ddc2eb93..a6cbdfcbeff30508d921d4637aac543dce9e8ad3 100644
--- a/ui/display/mac/screen_mac.mm
+++ b/ui/display/mac/screen_mac.mm
chore: bump chromium to 120.0.6099.0 (main) (#40316) * chore: bump chromium in DEPS to 120.0.6086.0 * chore: update patches * chore: rename FrameSubscriber::OnNewCropVersion() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4905819 just a simple renaming * chore: rename ToJsTime() to .InMillisecondsFSinceUnixEpoch() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4956111 function renamed upstream * chore: rename ToDoubleT() to .InSecondsFSinceUnixEpoch() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4956111 function renamed upstream * chore: rename FromDoubleT() to .FromSecondsSinceUnixEpoch() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4956111 function renamed upstream * chore: bump chromium in DEPS to 120.0.6088.2 * chore: update patches * chore: regen filenames.libcxx.gni * chore: migrate from (removed upstream) inputFormType to formControlType * chore: bump chromium in DEPS to 120.0.6089.0 * chore: update allow_disabling_blink_scheduler_throttling_per_renderview.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4828507 manually sync to upstream changes + reduce diff size * chore: update patches * chore: bump chromium in DEPS to 120.0.6090.0 * chore: update fix_disabling_background_throttling_in_compositor.patch no manual changes; patch applied with fuzz 2 (4 lines) Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4944206 * chore: update fix_handle_no_top_level_aura_window_in_webcontentsimpl.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4946653 do not patch WebContentsImpl::SetWindowShowState() any longer because it has been removed * chore: update patches * chore: bump chromium in DEPS to 120.0.6091.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6093.0 * chore: bump chromium in DEPS to 120.0.6095.0 * chore: bump chromium in DEPS to 120.0.6096.0 * chore: bump chromium in DEPS to 120.0.6097.0 * chore: update patches * chore: update patch after rebase * 4961495: [document pip] Focus the window when opened manually https://chromium-review.googlesource.com/c/chromium/src/+/4961495 * [Extensions UserScripts] Store extensions with user scripts in tracker | https://chromium-review.googlesource.com/c/chromium/src/+/4950530 * chore: bump chromium in DEPS to 120.0.6099.0 * chore: update patches * chore: update filenames.libcxx.gni * chore: remove trailing space --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
2023-11-01 14:02:12 +00:00
@@ -171,7 +171,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
display.set_color_depth(Display::kDefaultBitsPerPixel);
display.set_depth_per_component(Display::kDefaultBitsPerComponent);
}
+#if IS_MAS_BUILD()
+ // This is equivalent to the CGDisplayUsesForceToGray() API as at 2018-08-06,
+ // but avoids usage of the private API.
+ CFStringRef app = CFSTR("com.apple.CoreGraphics");
+ CFStringRef key = CFSTR("DisplayUseForcedGray");
+ Boolean key_valid = false;
+ display.set_is_monochrome(
+ CFPreferencesGetAppBooleanValue(key, app, &key_valid));
+#else
display.set_is_monochrome(CGDisplayUsesForceToGray());
+#endif
// Query the display's refresh rate.
chore: bump chromium to 115.0.5786.0 (main) (#38301) * chore: bump chromium in DEPS to 115.0.5772.0 * chore: update disable_color_correct_rendering.patch no manual changes; patch succeeded with fuzz 2. * chore: update chromium/build_libc_as_static_library.patch no manual changes; patch succeeded with fuzz 2 (offset 1 line). * chore: update chromium/feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4518747 patch manually reapplied due to upstream code shear * chore: update chromium/chore_patch_out_profile_methods_in_profile_selections_cc.patch https://chromium-review.googlesource.com/c/chromium/src/+/4502965 patch manually reapplied due to upstream code shear * chore: update bundle_locations #include location Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4525355 * chore: Remove `extension_name` from DesktopStreamsRegistry Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4514081 * chore: bump chromium in DEPS to 115.0.5778.0 * chore: add chromium/chore_patch_out_profile_methods_in_chrome_browser_pdf.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4482679 Another instance of patching out upstream references to Profile code * refactor: add WebViewGuestDelegate::GetGuestDelegateWeakPtr() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4515455 This approach copied from GuestViewBase::GetGuestDelegateWeakPtr() approach in that same commit. * fixup! chore: update bundle_locations #include location Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4525355 Sync namespace use to upstream base::mac -> base::apple changes * fixup! chore: update bundle_locations #include location Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4525355 Sync namespace use to upstream base::mac -> base::apple changes * chore: update chromium/mas_disable_remote_accessibility.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4530546 patch manually reapplied due to upstream code shear * chore: update chromium/printing.patch no manual changes; patch succeeded with fuzz * chore: update chromium/build_add_electron_tracing_category.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4517872 no manual changes; patch succeeded with fuzz * chore: update chromium/feat_ensure_mas_builds_of_the_same_application_can_use_safestorage.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4529098 patch manually reapplied due to upstream code shear * chromium/build_only_use_the_mas_build_config_in_the_required_components.patch https://chromium-review.googlesource.com/c/chromium/src/+/4529098 patch manually reapplied due to upstream code shear * chore: update chromium/mas-cgdisplayusesforcetogray.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4529475 no manual changes; patch succeeded with fuzz * chore: update chromium/build_only_use_the_mas_build_config_in_the_required_components.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4429011 no manual changes; patch succeeded with fuzz * chore: remove chromium/cherry-pick-48a136e77e6d.patch already present upstream * chore: remove chromium/cherry-pick-e6e23ba00379.patch already present upstream * [Code Health] Remove value based RegisterPref for Dict and List Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4533537 * Remove `cxx17_backports.h` and adjust unittest file Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4534916 Notes: mostly just removing #include and s/base::clamp/std::clamp/ * refactor: add FakeBrowserProcess helper class Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4424072 Used in ElectronBrowserMainParts' fake_browser_process_ field. Previously this was an BrowserProcessImpl instance, but upstream 4424072 makes that an abstract base class. `FakeBrowserProcess` is a thin subclass with the minimum code needed to make it concrete. `ElectronBrowserMainParts::fake_browser_process_` is now a `shared_ptr` instead of a `unique_ptr` so we can avoid exposing `FakeBrowserProcess` in the header. * fixup! refactor: add FakeBrowserProcess helper class remove unnecessary unique_ptr * fix: Browser::SetDockIcon() when !Browser.is_ready() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4410741 An alternative fix for https://github.com/electron/electron/pull/36279 . The previous fix was to call `SetSupportedScales()` ourselves (1b1609a), but upstream has removed this API. CC @codebytere * fixup! chore: remove chromium/cherry-pick-e6e23ba00379.patch * chore: update chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4517404 patch manually reapplied due to upstream code shear * chore: update patches * chore: add dep: resource_coordinator:mojo_bindings Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4521464 * fixup! chore: add dep: resource_coordinator:mojo_bindings chore: make lint happy * chore: patch out Profile methods in titlebar_config Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4508143 (primary) Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4534461 (followup) * chore: bump chromium in DEPS to 115.0.5780.0 * chore: update chromium/disable_hidden.patch no manual changes; patch succeeded with fuzz * chore: update chromium/sysroot.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4535715 no manual changes; patch succeeded with fuzz * chore: update chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4403623 patch manually reapplied due to upstream code shear * chore: update chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4547380 patch manually reapplied due to upstream code shear * chore: update patches * fixup! fix: Browser::SetDockIcon() when !Browser.is_ready() chore: iwyu image.h * chore: bump chromium in DEPS to 115.0.5782.0 * chore: bump chromium in DEPS to 115.0.5784.0 * 4514181: CR2023: Update filled cr-input styles. https://chromium-review.googlesource.com/c/chromium/src/+/4514181 * 4521894: Remove SiteInstanceDeleting usage outside of tests. https://chromium-review.googlesource.com/c/chromium/src/+/4521894 * 4525355: Move backup_util and bundle_locations to base/apple https://chromium-review.googlesource.com/c/chromium/src/+/4525355 * 4484743: webauthn: add underlying support for calling iCloud Keychain on macOS. https://chromium-review.googlesource.com/c/chromium/src/+/4484743 * chore: fixup patch indices * 4546398: Convert /chrome/browser to use ARC https://chromium-review.googlesource.com/c/chromium/src/+/4546398 * chore: bump chromium in DEPS to 115.0.5786.0 * chore: update patches * 4540682: Initialize PDF SDK with policy in chrome_pdf::RenderPDFPageToDC() https://chromium-review.googlesource.com/c/chromium/src/+/4540682 * Don't import ObjC++ fn headers into electron_api_app * 4535715: Refactor sysroot-creator.sh https://chromium-review.googlesource.com/c/chromium/src/+/4535715 * fixup! refactor: add FakeBrowserProcess helper class * 4531903: [string][test] Create/Copy strings to old space before externalization https://chromium-review.googlesource.com/c/v8/v8/+/4531903 * 59645: Add APIs to support RSA keys with large e. https://boringssl-review.googlesource.com/c/boringssl/+/59645 --------- Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
2023-05-23 19:58:58 +00:00
{