mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
a4cb3e2af9
* chore: bump chromium in DEPS to 87.0.4280.6 * chore: bump chromium in DEPS to 87.0.4280.11 * chore: update patches * Add deprecated_default_sources_assignment_filter variable https://chromium-review.googlesource.com/c/chromium/src/+/2416496 * 2426564: Remove global sources assignment filter value https://chromium-review.googlesource.com/c/chromium/src/+/2426564 * Remove set_sources_filter import * chore: fixup printing patch * Add DragOperation and AllowedDragOperations Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/2196167 * Add DragOperation and AllowedDragOperations Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/2196167 * Remove several references to BrowserPlugin from content https://chromium-review.googlesource.com/c/chromium/src/+/2401031 * Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * Remove several references to BrowserPlugin from content https://chromium-review.googlesource.com/c/chromium/src/+/2401031 * Service Manager embedders switches have been removed or moved Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2440974 * Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * [XProto] Remove usage of Xlib Visuals https://chromium-review.googlesource.com/c/chromium/src/+/2429933 * Implement tabs.removeCSS in electrons TabsExecuteScriptFunction Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2250506 * Remove lossy ConvertSizeToPixel() methods https://chromium-review.googlesource.com/c/chromium/src/+/2419534 * Remove all keyboard related usage of Xlib Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2436787 * fix: use parent namespace for zygote switches * ConvertRectToPixel methods have been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2429143 * impl SortingLSH service Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2425327 * chore: update patches * chore: fix servicemanager removed namespace * chore: revert removed methods * chore: update patches * ExtensionURLLoaderFactory is now owned by its receivers Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2357523 * chore: fix linting * Skip Angle manifest file https://chromium-review.googlesource.com/c/angle/angle/+/2425197 Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <nornagon@nornagon.net>
|
|
Date: Thu, 20 Sep 2018 17:49:20 -0700
|
|
Subject: mas-cfisobjc.patch
|
|
|
|
Removes usage of the _CFIsObjC private API.
|
|
|
|
diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
|
|
index e63f0ec0e2e618a4b280a08d14a619e1186e0466..225c6b83515c7b530ac59b1af7ac2194483f0311 100644
|
|
--- a/base/mac/foundation_util.mm
|
|
+++ b/base/mac/foundation_util.mm
|
|
@@ -29,12 +29,6 @@
|
|
#if !defined(OS_IOS)
|
|
CFTypeID SecACLGetTypeID();
|
|
CFTypeID SecTrustedApplicationGetTypeID();
|
|
-// The NSFont/CTFont toll-free bridging is broken before 10.15.
|
|
-// http://www.openradar.me/15341349 rdar://15341349
|
|
-//
|
|
-// TODO(https://crbug.com/1076527): This is fixed in 10.15. When 10.15 is the
|
|
-// minimum OS for Chromium, remove this SPI declaration.
|
|
-Boolean _CFIsObjC(CFTypeID typeID, CFTypeRef obj);
|
|
#endif
|
|
} // extern "C"
|
|
|
|
@@ -327,8 +321,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
|
|
const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
|
|
DCHECK(!cf_val ||
|
|
CTFontGetTypeID() == CFGetTypeID(cf_val) ||
|
|
- (_CFIsObjC(CTFontGetTypeID(), cf_val) &&
|
|
- [ns_val isKindOfClass:[NSFont class]]));
|
|
+ ([ns_val isKindOfClass:[NSFont class]]));
|
|
return ns_val;
|
|
}
|
|
|
|
@@ -399,9 +392,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
|
|
return (CTFontRef)(cf_val);
|
|
}
|
|
|
|
- if (!_CFIsObjC(CTFontGetTypeID(), cf_val))
|
|
- return NULL;
|
|
-
|
|
id<NSObject> ns_val = reinterpret_cast<id>(const_cast<void*>(cf_val));
|
|
if ([ns_val isKindOfClass:[NSFont class]]) {
|
|
return (CTFontRef)(cf_val);
|