87f7625c5d
* chore: bump chromium in DEPS to 96.0.4662.0 * chore: bump chromium in DEPS to 96.0.4663.0 * chore: update patches * [Extensions] Remove RuntimeData entirely3177328* Make helper macros behave consistently for //content/public UserData types3198788* Enabling sandboxing for the speech recognition service browser tests3146090* [devtools] Add 'RegisterPreference' host binding3162281* [Reland][Extensions]: Add persistAcrossSessions flag (scripting API)3175161* [Bluetooth] Add Passkey prompt dialog for bonding.2841104* Clipboard: Remove ReadImage path in browser3194826* Split printing metafile code into its own target.3164925* Cleanup unused DesktopMediaListObserver params3179203* Remove base::DictionaryValue::GetBinary3201974* Window Placement: change RWHV::GetDisplayList to GetScreenInfos3138774* Add a preview to the Tab Capture picker dialog3045268* Add service-based usage to update print settings3155426* chore: bump chromium in DEPS to 96.0.4664.2 * chore: update patches * chore: bump chromium in DEPS to 96.0.4664.4 * chore: update patches * chore: bump chromium in DEPS to 97.0.4666.0 * Revert "chore: bump chromium in DEPS to 97.0.4666.0" This reverts commit d73caae8ba4b39efc9b3ea4de52685b9c92ef3d0. * Reland "Block external protocol handler with sandbox."3198263* fixup for lint * Add CookiePartitionKeychain parameter to CookeManager.GetCookieList.3206016* Move ui/gfx/transform*,rrect*,mask_filter_info* into ui/gfx/geometry3200392* fixup Move ui/gfx/transform*,rrect*,mask_filter_info* into ui/gfx/geometry * ozone: //chrome/browser clean up from USE_X113186490* content: don't load v8 snapshot in browser process3183394* [devtools] Add 'RegisterPreference' host binding3162281* 3186491: Add 'devtools.sync_preferences' preference3186491* 2951147: DCHECK accessible names for focusable Views2951147* 3201014: Use real font size for calculation of SmallTextRatio3201014* fixup Clipboard: Remove ReadImage path in browser * chore: update patches * fix: disable PlzServiceWorker to fix custom protocol SW script loading Ref:3199761Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <nornagon@nornagon.net>
|
|
Date: Thu, 20 Sep 2018 17:49:24 -0700
|
|
Subject: mas: avoid usage of CGDisplayUsesForceToGray
|
|
|
|
Removes usage of the CGDisplayUsesForceToGray private API.
|
|
|
|
diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm
|
|
index 7354a04f927af9a61eff83a8a5a9bc1054da80ec..f38ef7e9e1781f0c880ffcccabb984dcafdaada8 100644
|
|
--- a/ui/display/mac/screen_mac.mm
|
|
+++ b/ui/display/mac/screen_mac.mm
|
|
@@ -149,7 +149,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
|
|
display.set_color_depth(Display::kDefaultBitsPerPixel);
|
|
display.set_depth_per_component(Display::kDefaultBitsPerComponent);
|
|
}
|
|
+#ifdef 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
|
|
|
|
if (auto display_link = ui::DisplayLinkMac::GetForDisplay(display_id))
|
|
display.set_display_frequency(display_link->GetRefreshRate());
|