mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 116.0.5829.0 (main) (#38726)

Browse source 
* chore: bump chromium in DEPS to 116.0.5823.0

* chore: update patches

* chore: bump chromium in DEPS to 116.0.5825.0

* chore: update patches

* chore: bump chromium in DEPS to 116.0.5827.0

* chore: update patches

* 4568811: Integrate Search Prefetch with Extensions.

4568811

* 4567511: [DevTools] Add recordCountHistogram API.

4567511

* 4507692: Delete base/guid.h

4507692

* 4589551: Convert some of /base to use ARC

4589551
Also:
4601769: Convert immersive mode controllers to use ARC
4601769

* [viz] Convert MaybeSizeInBytes() to take in SharedImageFormat

4594677

* 4564108: [BRP] Enable check_raw_ptr_fields for Mac

4564108

* chore: bump chromium in DEPS to 116.0.5828.0

* chore: bump chromium in DEPS to 116.0.5829.0

* chore: update patches

---------

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: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot] 2023-06-13 14:45:48 -04:00 • committed by GitHub
parent 678d1aa37d
commit 80a3ba5c68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
66 changed files with 275 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

3
shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h
View file

@ -9,6 +9,7 @@
#include "base/apple/owned_objc.h"
#include "base/mac/scoped_nsobject.h"
#include "base/memory/raw_ptr.h"
#include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
#include "ui/base/cocoa/base_view.h"
@ -24,7 +25,7 @@ using electron::InspectableWebContentsViewMac;
@interface ElectronInspectableWebContentsView : BaseView <NSWindowDelegate> {
@private
electron::InspectableWebContentsViewMac* inspectableWebContentsView_;
raw_ptr<electron::InspectableWebContentsViewMac> inspectableWebContentsView_;
base::scoped_nsobject<NSView> fake_view_;
base::scoped_nsobject<NSWindow> devtools_window_;

3
shell/browser/ui/cocoa/electron_native_widget_mac.h
View file

@ -7,6 +7,7 @@
#include <string>
#include "base/memory/raw_ptr.h"
#include "ui/views/widget/native_widget_mac.h"
namespace electron {
@ -31,7 +32,7 @@ class ElectronNativeWidgetMac : public views::NativeWidgetMac {
const remote_cocoa::mojom::CreateWindowParams* params) override;
private:
NativeWindowMac* shell_;
raw_ptr<NativeWindowMac> shell_;
std::string window_type_;
NSUInteger style_mask_;
};

3
shell/browser/ui/cocoa/electron_ns_window.h
View file

@ -5,6 +5,7 @@
#ifndef ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_NS_WINDOW_H_
#define ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_NS_WINDOW_H_
#include "base/memory/raw_ptr.h"
#include "components/remote_cocoa/app_shim/native_widget_mac_nswindow.h"
#include "shell/browser/ui/cocoa/event_dispatching_window.h"
#include "ui/views/widget/native_widget_mac.h"
@ -30,7 +31,7 @@ class ScopedDisableResize {
@interface ElectronNSWindow : NativeWidgetMacNSWindow {
@private
electron::NativeWindowMac* shell_;
raw_ptr<electron::NativeWindowMac> shell_;
}
@property BOOL acceptsFirstMouse;
@property BOOL enableLargerThanScreen;

3
shell/browser/ui/cocoa/electron_ns_window_delegate.h
View file

@ -7,6 +7,7 @@
#include <Quartz/Quartz.h>
#include "base/memory/raw_ptr.h"
#include "components/remote_cocoa/app_shim/views_nswindow_delegate.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
@ -17,7 +18,7 @@ class NativeWindowMac;
@interface ElectronNSWindowDelegate
: ViewsNSWindowDelegate <NSTouchBarDelegate, QLPreviewPanelDataSource> {
@private
electron::NativeWindowMac* shell_;
raw_ptr<electron::NativeWindowMac> shell_;
bool is_zooming_;
int level_;
bool is_resizable_;

3
shell/browser/ui/cocoa/electron_touch_bar.h
View file

@ -12,6 +12,7 @@
#include <vector>
#include "base/mac/scoped_nsobject.h"
#include "base/memory/raw_ptr.h"
#include "shell/browser/native_window.h"
#include "shell/common/gin_helper/persistent_dictionary.h"
@ -22,7 +23,7 @@
std::vector<gin_helper::PersistentDictionary> ordered_settings_;
std::map<std::string, gin_helper::PersistentDictionary> settings_;
id<NSTouchBarDelegate> delegate_;
electron::NativeWindow* window_;
raw_ptr<electron::NativeWindow> window_;
}
- (id)initWithDelegate:(id<NSTouchBarDelegate>)delegate

3
shell/browser/ui/cocoa/root_view_mac.h
View file

@ -5,6 +5,7 @@
#ifndef ELECTRON_SHELL_BROWSER_UI_COCOA_ROOT_VIEW_MAC_H_
#define ELECTRON_SHELL_BROWSER_UI_COCOA_ROOT_VIEW_MAC_H_
#include "base/memory/raw_ptr.h"
#include "ui/views/view.h"
namespace electron {
@ -27,7 +28,7 @@ class RootViewMac : public views::View {
private:
// Parent window, weak ref.
NativeWindow* window_;
raw_ptr<NativeWindow> window_;
};
} // namespace electron

7
shell/browser/ui/inspectable_web_contents.cc
View file

@ -9,7 +9,6 @@
#include <utility>
#include "base/base64.h"
#include "base/guid.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/json/string_escape.h"
@ -20,6 +19,7 @@
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/uuid.h"
#include "base/values.h"
#include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
#include "components/prefs/pref_registry_simple.h"
@ -1044,8 +1044,9 @@ void InspectableWebContents::DidFinishNavigation(
// most likely bug in chromium.
base::ReplaceFirstSubstringAfterOffset(&it->second, 0, "var chrome",
"var chrome = window.chrome ");
auto script = base::StringPrintf("%s(\"%s\")", it->second.c_str(),
base::GenerateGUID().c_str());
auto script = base::StringPrintf(
"%s(\"%s\")", it->second.c_str(),
base::Uuid::GenerateRandomV4().AsLowercaseString().c_str());
// Invoking content::DevToolsFrontendHost::SetupExtensionsAPI(frame, script);
// should be enough, but it seems to be a noop currently.
frame->ExecuteJavaScriptForTests(base::UTF8ToUTF16(script),

5
shell/browser/ui/inspectable_web_contents.h
View file

@ -133,6 +133,11 @@ class InspectableWebContents
void OpenNodeFrontend() override;
void DispatchProtocolMessageFromDevToolsFrontend(
const std::string& message) override;
void RecordCountHistogram(const std::string& name,
int sample,
int min,
int exclusive_max,
int buckets) override {}
void SendJsonRequest(DispatchCallback callback,
const std::string& browser_id,
const std::string& url) override;

5
shell/browser/ui/tray_icon_cocoa.mm
View file

@ -7,6 +7,7 @@
#include <string>
#include <vector>
#include "base/memory/raw_ptr.h"
#include "base/message_loop/message_pump_mac.h"
#include "base/strings/sys_string_conversions.h"
#include "base/task/current_thread.h"
@ -19,8 +20,8 @@
#include "ui/native_theme/native_theme.h"
@interface StatusItemView : NSView {
electron::TrayIconCocoa* trayIcon_; // weak
ElectronMenuController* menuController_; // weak
raw_ptr<electron::TrayIconCocoa> trayIcon_; // weak
ElectronMenuController* menuController_; // weak
BOOL ignoreDoubleClickEvents_;
base::scoped_nsobject<NSStatusItem> statusItem_;
base::scoped_nsobject<NSTrackingArea> trackingArea_;