chore: bump chromium to 116.0.5829.0 (main) (#38726)
* 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.h4507692
* 4589551: Convert some of /base to use ARC4589551
Also: 4601769: Convert immersive mode controllers to use ARC4601769
* [viz] Convert MaybeSizeInBytes() to take in SharedImageFormat4594677
* 4564108: [BRP] Enable check_raw_ptr_fields for Mac4564108
* 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:
parent
678d1aa37d
commit
80a3ba5c68
66 changed files with 275 additions and 235 deletions
|
@ -43,7 +43,7 @@
|
|||
#if BUILDFLAG(IS_LINUX)
|
||||
#include "base/containers/span.h"
|
||||
#include "base/files/file_util.h"
|
||||
#include "base/guid.h"
|
||||
#include "base/uuid.h"
|
||||
#include "components/crash/core/common/crash_keys.h"
|
||||
#include "components/upload_list/combining_upload_list.h"
|
||||
#include "v8/include/v8-wasm-trap-handler-posix.h"
|
||||
|
@ -117,7 +117,7 @@ std::string GetClientId() {
|
|||
return *client_id;
|
||||
*client_id = ReadClientId();
|
||||
if (client_id->empty()) {
|
||||
*client_id = base::GenerateGUID();
|
||||
*client_id = base::Uuid::GenerateRandomV4().AsLowercaseString();
|
||||
WriteClientId(*client_id);
|
||||
}
|
||||
return *client_id;
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
#include "shell/browser/api/electron_api_notification.h"
|
||||
|
||||
#include "base/guid.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "base/uuid.h"
|
||||
#include "gin/handle.h"
|
||||
#include "shell/browser/api/electron_api_menu.h"
|
||||
#include "shell/browser/browser.h"
|
||||
|
@ -226,7 +226,8 @@ void Notification::Close() {
|
|||
void Notification::Show() {
|
||||
Close();
|
||||
if (presenter_) {
|
||||
notification_ = presenter_->CreateNotification(this, base::GenerateGUID());
|
||||
notification_ = presenter_->CreateNotification(
|
||||
this, base::Uuid::GenerateRandomV4().AsLowercaseString());
|
||||
if (notification_) {
|
||||
electron::NotificationOptions options;
|
||||
options.title = title_;
|
||||
|
|
|
@ -15,11 +15,11 @@
|
|||
#include "base/files/file_enumerator.h"
|
||||
#include "base/files/file_path.h"
|
||||
#include "base/files/file_util.h"
|
||||
#include "base/guid.h"
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "base/strings/string_util.h"
|
||||
#include "base/strings/stringprintf.h"
|
||||
#include "base/uuid.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/common/chrome_switches.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
|
@ -277,7 +277,8 @@ void DownloadIdCallback(content::DownloadManager* download_manager,
|
|||
const base::Time& start_time,
|
||||
uint32_t id) {
|
||||
download_manager->CreateDownloadItem(
|
||||
base::GenerateGUID(), id, path, path, url_chain, GURL(),
|
||||
base::Uuid::GenerateRandomV4().AsLowercaseString(), id, path, path,
|
||||
url_chain, GURL(),
|
||||
content::StoragePartitionConfig::CreateDefault(
|
||||
download_manager->GetBrowserContext()),
|
||||
GURL(), GURL(), absl::nullopt, mime_type, mime_type, start_time,
|
||||
|
|
|
@ -1364,7 +1364,9 @@ bool ElectronBrowserClient::WillCreateURLLoaderFactory(
|
|||
std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
|
||||
ElectronBrowserClient::WillCreateURLLoaderRequestInterceptors(
|
||||
content::NavigationUIData* navigation_ui_data,
|
||||
int frame_tree_node_id) {
|
||||
int frame_tree_node_id,
|
||||
int64_t navigation_id,
|
||||
scoped_refptr<base::SequencedTaskRunner> navigation_response_task_runner) {
|
||||
std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
|
||||
interceptors;
|
||||
#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
||||
|
|
|
@ -234,7 +234,10 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
|
|||
std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
|
||||
WillCreateURLLoaderRequestInterceptors(
|
||||
content::NavigationUIData* navigation_ui_data,
|
||||
int frame_tree_node_id) override;
|
||||
int frame_tree_node_id,
|
||||
int64_t navigation_id,
|
||||
scoped_refptr<base::SequencedTaskRunner> navigation_response_task_runner)
|
||||
override;
|
||||
bool ShouldTreatURLSchemeAsFirstPartyWhenTopLevel(
|
||||
base::StringPiece scheme,
|
||||
bool is_embedded_origin_secure) override;
|
||||
|
@ -330,7 +333,7 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
|
|||
web_authentication_delegate_;
|
||||
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
ElectronBrowserMainParts* browser_main_parts_ = nullptr;
|
||||
raw_ptr<ElectronBrowserMainParts> browser_main_parts_ = nullptr;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -9,9 +9,9 @@
|
|||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
#include "base/guid.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "base/strings/stringprintf.h"
|
||||
#include "base/uuid.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
#include "content/public/browser/storage_partition.h"
|
||||
#include "mojo/public/cpp/system/data_pipe_producer.h"
|
||||
|
@ -552,8 +552,8 @@ void ElectronURLLoaderFactory::StartLoadingHttp(
|
|||
v8::Local<v8::Value> value;
|
||||
if (dict.Get("session", &value)) {
|
||||
if (value->IsNull()) {
|
||||
browser_context =
|
||||
ElectronBrowserContext::From(base::GenerateGUID(), true);
|
||||
browser_context = ElectronBrowserContext::From(
|
||||
base::Uuid::GenerateRandomV4().AsLowercaseString(), true);
|
||||
} else {
|
||||
gin::Handle<api::Session> session;
|
||||
if (gin::ConvertFromV8(dict.isolate(), value, &session) &&
|
||||
|
|
|
@ -7,6 +7,8 @@
|
|||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
#include "base/memory/raw_ptr.h"
|
||||
|
||||
namespace electron {
|
||||
class NotificationPresenterMac;
|
||||
}
|
||||
|
@ -14,7 +16,7 @@ class NotificationPresenterMac;
|
|||
@interface NotificationCenterDelegate
|
||||
: NSObject <NSUserNotificationCenterDelegate> {
|
||||
@private
|
||||
electron::NotificationPresenterMac* presenter_;
|
||||
raw_ptr<electron::NotificationPresenterMac> presenter_;
|
||||
}
|
||||
- (instancetype)initWithPresenter:
|
||||
(electron::NotificationPresenterMac*)presenter;
|
||||
|
|
|
@ -43,7 +43,7 @@ void LayeredWindowUpdater::OnAllocatedSharedMemory(
|
|||
// Make sure |pixel_size| is sane.
|
||||
size_t expected_bytes;
|
||||
bool size_result = viz::ResourceSizes::MaybeSizeInBytes(
|
||||
pixel_size, viz::ResourceFormat::RGBA_8888, &expected_bytes);
|
||||
pixel_size, viz::SinglePlaneFormat::kRGBA_8888, &expected_bytes);
|
||||
if (!size_result)
|
||||
return;
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#include "shell/browser/native_window_observer.h"
|
||||
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "base/memory/raw_ptr_exclusion.h"
|
||||
#include "content/browser/renderer_host/render_view_host_delegate_view.h" // nogncheck
|
||||
#include "content/browser/web_contents/web_contents_view.h" // nogncheck
|
||||
#include "content/public/browser/web_contents.h"
|
||||
|
@ -104,7 +105,7 @@ class OffScreenWebContentsView : public content::WebContentsView,
|
|||
raw_ptr<content::WebContents> web_contents_ = nullptr;
|
||||
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
OffScreenView* offScreenView_;
|
||||
RAW_PTR_EXCLUSION OffScreenView* offScreenView_;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -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_;
|
||||
|
|
|
@ -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_;
|
||||
};
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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_;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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_;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue