mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: bump chromium to 118.0.5975.0 (main) (#39531)
* chore: bump chromium in DEPS to 118.0.5951.0 * chore: update printing.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4727894 No logic changes, but patch needed to be manually re-applied due to upstream code shear * chore: update port_autofill_colors_to_the_color_pipeline.patch No manual changes; patch applied with fuzz * chore: update patches * chore: bump chromium in DEPS to 118.0.5953.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5955.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5957.0 * chore: update patches * chore: include path of native_web_keyboard_event.h Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689 * chore: remove reference to eextensions/browser/notification-types.h Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4771627 * chore: update references to renamed upstream field NativeWebKeyboardEvent.skip_if_unhandled (formerly known as skip_in_browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689 Need a second pair of eyes on this commit. In particular the reference in content_converter.cc, skipInBrowser, seems to not be set or documented anywhere? Is this unused/vestigal code? * chore: sync signature of ElectronExtensionsBrowserClient::IsValidContext() to upstream change Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4784198 * chore: add auto_pip_setting_helper.[cc,h] to chromium_src build Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4688277 Exiting upstream code used by chromium_src now depends on this new upstream class * chore: bump chromium in DEPS to 118.0.5959.0 * chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: add_maximized_parameter_to_linuxui_getwindowframeprovider.patch manually adjust patch to minor upstream chagnes * chore: update patches * chore: bump chromium in DEPS to 118.0.5961.0 * chore: bump chromium in DEPS to 118.0.5963.0 * chore: update patches * 4780994: Rename various base files to "apple" since iOS uses them too https://chromium-review.googlesource.com/c/chromium/src/+/4780994 * Many files moved from `mac` -> `apple` This commit follows a handful of CLs that simply rename files/symbols to change `mac` to `apple` to signify their use across both macOS and iOS: - 4784010: Move scoped_nsautorelease_pool to base/apple, leave a forwarding header - 4790744: Move foundation_util to base/apple, leave a forwarding header - 4790741: Move scoped_cftypreref to base/apple, leave a forwarding header - 4787627: Move and rename macOS+iOS base/ files in PA to "apple" - 4780399: Move OSStatus logging to base/apple - 4787387: Remove forwarding headers - 4781113: Rename message_pump_mac to "apple" because iOS uses it too * fixup minor patch update error A function param got dropped from this patch somewhere earlier * chore: bump chromium in DEPS to 118.0.5965.2 * chore: update patches * 4799213: Move ScopedTypeRef and ScopedCFTypeRef into base::apple:: https://chromium-review.googlesource.com/c/chromium/src/+/4799213 * Fix removed include to BrowserContext In crrev.com/c/4767962 an include to BrowserContext was removed, which was necessary for compilation. This broke only for us because "chrome/browser/profiles/profile.h" includes that class, but we remove all references to profiles. * chore: bump chromium in DEPS to 118.0.5967.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5969.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5971.0 * chore: bump chromium in DEPS to 118.0.5973.0 * chore: update patches * 4772121: [OOPIF PDF] Replace PDFWebContentsHelper with PDFDocumentHelper https://chromium-review.googlesource.com/c/chromium/src/+/4772121 * 4811164: [Extensions] Do some cleanup in ChromeManagementAPIDelegate. https://chromium-review.googlesource.com/c/chromium/src/+/4811164 * 4809488: Remove duplicate dnd functionality between Web and Renderer prefs https://chromium-review.googlesource.com/c/chromium/src/+/4809488 Given that this is no longer an option of web preferences, we should consider deprecating this option and then removing it. * chore: bump chromium in DEPS to 118.0.5975.0 * chore: update patches * fixup! chore: add auto_pip_settings_helper.{cc|h} to chromium_src build * Reland "[windows] Remove RegKey::DeleteEmptyKey" Refs https://chromium-review.googlesource.com/c/chromium/src/+/4813255 * Ensure StrCat means StrCat Refs https://chromium-review.googlesource.com/c/chromium/src/+/1117180 * fixup! Remove RegKey::DeleteEmptyKey * Consistently reject large p and large q in DH Refs https://boringssl-review.googlesource.com/c/boringssl/+/62226 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
committed by
GitHub
parent
0b0707145b
commit
89117fdd99
@@ -5,7 +5,7 @@
|
||||
#ifndef ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_BUNDLE_MOVER_H_
|
||||
#define ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_BUNDLE_MOVER_H_
|
||||
|
||||
#include "base/mac/foundation_util.h"
|
||||
#include "base/apple/foundation_util.h"
|
||||
#include "shell/common/gin_helper/error_thrower.h"
|
||||
|
||||
namespace gin {
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
#include "base/apple/foundation_util.h"
|
||||
#include "base/logging.h"
|
||||
#include "base/mac/foundation_util.h"
|
||||
#include "base/strings/sys_string_conversions.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "content/public/browser/browser_task_traits.h"
|
||||
@@ -104,7 +104,7 @@ NSArray* ConvertSharingItemToNS(const SharingItem& item) {
|
||||
}
|
||||
if (item.file_paths) {
|
||||
for (const base::FilePath& path : *item.file_paths)
|
||||
[result addObject:base::mac::FilePathToNSURL(path)];
|
||||
[result addObject:base::apple::FilePathToNSURL(path)];
|
||||
}
|
||||
if (item.urls) {
|
||||
for (const GURL& url : *item.urls)
|
||||
@@ -134,9 +134,8 @@ NSArray* ConvertSharingItemToNS(const SharingItem& item) {
|
||||
}
|
||||
|
||||
+ (electron::ElectronMenuModel*)getFrom:(id)instance {
|
||||
return
|
||||
[base::mac::ObjCCastStrict<WeakPtrToElectronMenuModelAsNSObject>(instance)
|
||||
menuModel];
|
||||
return [base::apple::ObjCCastStrict<WeakPtrToElectronMenuModelAsNSObject>(
|
||||
instance) menuModel];
|
||||
}
|
||||
|
||||
- (instancetype)initWithModel:(electron::ElectronMenuModel*)model {
|
||||
@@ -482,10 +481,10 @@ NSArray* ConvertSharingItemToNS(const SharingItem& item) {
|
||||
// Performs the share action using the sharing service represented by |sender|.
|
||||
- (void)performShare:(NSMenuItem*)sender {
|
||||
NSDictionary* object =
|
||||
base::mac::ObjCCastStrict<NSDictionary>([sender representedObject]);
|
||||
base::apple::ObjCCastStrict<NSDictionary>([sender representedObject]);
|
||||
NSSharingService* service =
|
||||
base::mac::ObjCCastStrict<NSSharingService>(object[@"service"]);
|
||||
NSArray* items = base::mac::ObjCCastStrict<NSArray>(object[@"items"]);
|
||||
base::apple::ObjCCastStrict<NSSharingService>(object[@"service"]);
|
||||
NSArray* items = base::apple::ObjCCastStrict<NSArray>(object[@"items"]);
|
||||
[service setDelegate:self];
|
||||
[service performWithItems:items];
|
||||
}
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "base/apple/foundation_util.h"
|
||||
#include "base/files/file_path.h"
|
||||
#include "base/mac/foundation_util.h"
|
||||
|
||||
// Contents largely copied from
|
||||
// chrome/browser/download/drag_download_item_mac.mm.
|
||||
@@ -53,7 +53,7 @@ void DragFileItems(const std::vector<base::FilePath>& files,
|
||||
|
||||
NSMutableArray* file_items = [NSMutableArray array];
|
||||
for (auto const& file : files) {
|
||||
NSURL* file_url = base::mac::FilePathToNSURL(file);
|
||||
NSURL* file_url = base::apple::FilePathToNSURL(file);
|
||||
NSDraggingItem* file_item =
|
||||
[[NSDraggingItem alloc] initWithPasteboardWriter:file_url];
|
||||
NSImage* file_image = icon.ToNSImage();
|
||||
|
||||
@@ -11,10 +11,10 @@
|
||||
#import <Cocoa/Cocoa.h>
|
||||
#import <CoreServices/CoreServices.h>
|
||||
|
||||
#include "base/apple/foundation_util.h"
|
||||
#include "base/apple/scoped_cftyperef.h"
|
||||
#include "base/files/file_util.h"
|
||||
#include "base/mac/foundation_util.h"
|
||||
#include "base/mac/mac_util.h"
|
||||
#include "base/mac/scoped_cftyperef.h"
|
||||
#include "base/strings/sys_string_conversions.h"
|
||||
#include "content/public/browser/browser_task_traits.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <vector>
|
||||
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "base/message_loop/message_pump_mac.h"
|
||||
#include "base/message_loop/message_pump_apple.h"
|
||||
#include "base/strings/sys_string_conversions.h"
|
||||
#include "base/task/current_thread.h"
|
||||
#include "content/public/browser/browser_task_traits.h"
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
#include "shell/browser/ui/autofill_popup.h"
|
||||
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "content/public/browser/native_web_keyboard_event.h"
|
||||
#include "content/public/browser/render_widget_host.h"
|
||||
#include "content/public/common/input/native_web_keyboard_event.h"
|
||||
#include "electron/buildflags/buildflags.h"
|
||||
#include "shell/browser/osr/osr_view_proxy.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "content/public/browser/native_web_keyboard_event.h"
|
||||
#include "content/public/common/input/native_web_keyboard_event.h"
|
||||
#include "shell/browser/native_window.h"
|
||||
#include "shell/browser/ui/views/menu_bar.h"
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "content/public/browser/ax_event_notification_details.h"
|
||||
#include "content/public/browser/ax_inspect_factory.h"
|
||||
#include "content/public/browser/browser_accessibility_state.h"
|
||||
#include "content/public/browser/browser_context.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
#include "content/public/browser/favicon_status.h"
|
||||
#include "content/public/browser/navigation_entry.h"
|
||||
|
||||
Reference in New Issue
Block a user