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

chore: bump chromium to 93.0.4530.0 (master) (#29256)

Browse source 
* chore: bump chromium in DEPS to 92.0.4512.6

* 2887336: [CaptureHandle][#2] Propagate CaptureHandleConfig in browser process

2887336

* refactor: base::Optional -> absl::optional

* chore: fixup patch indices

* chore: bump chromium in DEPS to 92.0.4514.0

* 2899417: Make build work when enable_pdf is set to false.

2899417

* 2904731: use BrowserContext instead of Profile in PreconnectManager

2904731

* 2295749: fix: check IsSecureEventInputEnabled in constructor before setting SetPasswordInputEnabled to true

2295749

* 2893803: Add a GetWebView to RenderFrame.

2893803

* 2892345: Implement WebContents::ForEachRenderFrameHost

2892345

* chore: fixup patch indices

* 2892048: Real instance methods for BrowserContext: remaining 5 methods.

2892048

* 2902821: [mojo] Don't require full header includes for referenced interfaces

2902821

* 2496500: Remove last deprecated extension Event ctor.

2496500

* chore: fixup malformed pepper support patch

* chore: bump chromium in DEPS to 92.0.4515.0

* 2908461: Add CreateEmptyPrintPagesParamsPtr() inside print_view_manager_base.cc.

2908461

* 2880838: viz: add optional HDRMetadata to TransferableResource

2880838

* chore: fixup patch indices

* chore: bump chromium in DEPS to 92.0.4515.5

* chore: update patches

* chore: bump chromium in DEPS to 92.0.4515.7

* chore: bump chromium in DEPS to 92.0.4515.9

* chore: bump chromium in DEPS to 93.0.4522.0

* chore: bump chromium in DEPS to 93.0.4523.0

* chore: bump chromium in DEPS to 93.0.4524.0

* chore: update patches

* chore: enable_pak_file_integrity_checks was reverted

* chore: update patches

* refactor: base/optional was replaced with absl::optional

Refs: 2910202

* refactor: replace all usages of base::nullopt with absl::nullopt

Refs: 2910202

* chore: add missing base::Contains include

Refs: 2910202

* refactor: replace all usages of base::make_optional with
absl::make_optional

Refs: 2910202

* refactor: replace WorldScriptContext() with GetScriptContextFromWorldId

Refs: 2893213

* chore: clean up left over opening namespace

Refs: 95bfe6d08f

* chore: add missing base::Contains include

Refs: 2910202

* refactor: replace GetCurrentDisplayIterator with the hard checker
GetCurrentDisplay

This code looks suspicious but if the iterator was invalid before it
will also be invalid now.

Refs: 2893191

* refactor: headers are now passed directly in extensions client

Refs: 2918906

* refactor: base::DictionaryValue::empty() has been removed

Refs: 2912424

* chore: add missing includes for network URLLoaderFactory

Refs: unknown, probably a side effect of header changes

* refactor: make convenience wrapper around AppendArg

There is no converter FromV8 for base::StringPiece (apparently its not
possible).  So we now take in an std::string and use the construct for
StringPiece to do implicit conversion.

Refs: 2905544

* chore: add patch

* chore: bump chromium in DEPS to 93.0.4525.0

* chore: update patches

* refactor: CanResize has been de-virtualized

Refs: 2485774

* chore: update resource integrity patch

* chore: add character encoding idl patch

* chore: bump chromium in DEPS to 93.0.4526.0

* chore: update patches

* chore: bump chromium in DEPS to 93.0.4527.0

* chore: bump chromium in DEPS to 93.0.4528.0

* chore: update patches

* chore: update idl encoding patch

* chore: bump chromium in DEPS to 93.0.4529.0

* chore: update patches

* chore: bump chromium in DEPS to 93.0.4530.0

* chore: update patches

* fix: only SetCanResize after the widget has been initialized

* chore: add patch for vr on windows gn gen

* spec: fix focus related tests on linux due to delay in focus swap

* chore: remove new usages of base::Optional from main

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <sattard@slack-corp.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
This commit is contained in:
electron-roller[bot] 2021-06-03 01:05:04 -07:00 • committed by GitHub
parent 8d0ed05c99
commit 8532e1239e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
165 changed files with 720 additions and 1048 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/ui/accelerator_util.cc
View file

@ -31,7 +31,7 @@ bool StringToAccelerator(const std::string& shortcut,
// Now, parse it into an accelerator.
int modifiers = ui::EF_NONE;
ui::KeyboardCode key = ui::VKEY_UNKNOWN;
base::Optional<char16_t> shifted_char;
absl::optional<char16_t> shifted_char;
for (const auto& token : tokens) {
ui::KeyboardCode code = electron::KeyboardCodeFromStr(token, &shifted_char);
if (shifted_char)

6
shell/browser/ui/cocoa/window_buttons_view.h
View file

@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h>
#include "base/mac/scoped_nsobject.h"
#include "base/optional.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "ui/gfx/geometry/point.h"
// Custom Quit, Minimize and Full Screen button container for frameless
@ -22,8 +22,8 @@
base::scoped_nsobject<NSTrackingArea> tracking_area_;
}
- (id)initWithMargin:(const base::Optional<gfx::Point>&)margin;
- (void)setMargin:(const base::Optional<gfx::Point>&)margin;
- (id)initWithMargin:(const absl::optional<gfx::Point>&)margin;
- (void)setMargin:(const absl::optional<gfx::Point>&)margin;
- (void)setShowOnHover:(BOOL)yes;
- (void)setNeedsDisplayForButtons;
@end

4
shell/browser/ui/cocoa/window_buttons_view.mm
View file

@ -23,7 +23,7 @@ const NSWindowButton kButtonTypes[] = {
@implementation WindowButtonsView
- (id)initWithMargin:(const base::Optional<gfx::Point>&)margin {
- (id)initWithMargin:(const absl::optional<gfx::Point>&)margin {
self = [super initWithFrame:NSZeroRect];
[self setMargin:margin];
@ -50,7 +50,7 @@ const NSWindowButton kButtonTypes[] = {
return self;
}
- (void)setMargin:(const base::Optional<gfx::Point>&)margin {
- (void)setMargin:(const absl::optional<gfx::Point>&)margin {
margin_ = margin.value_or(gfx::Point(7, 3));
}

2
shell/browser/ui/electron_menu_model.cc
View file

@ -98,7 +98,7 @@ void ElectronMenuModel::SetSharingItem(SharingItem item) {
sharing_item_.emplace(std::move(item));
}
const base::Optional<ElectronMenuModel::SharingItem>&
const absl::optional<ElectronMenuModel::SharingItem>&
ElectronMenuModel::GetSharingItem() const {
return sharing_item_;
}

12
shell/browser/ui/electron_menu_model.h
View file

@ -13,7 +13,7 @@
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/observer_list_types.h"
#include "base/optional.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "ui/base/models/simple_menu_model.h"
#include "url/gurl.h"
@ -28,9 +28,9 @@ class ElectronMenuModel : public ui::SimpleMenuModel {
SharingItem(const SharingItem&) = delete;
~SharingItem();
base::Optional<std::vector<std::string>> texts;
base::Optional<std::vector<GURL>> urls;
base::Optional<std::vector<base::FilePath>> file_paths;
absl::optional<std::vector<std::string>> texts;
absl::optional<std::vector<GURL>> urls;
absl::optional<std::vector<base::FilePath>> file_paths;
};
#endif
@ -93,7 +93,7 @@ class ElectronMenuModel : public ui::SimpleMenuModel {
bool GetSharingItemAt(int index, SharingItem* item) const;
// Set/Get the SharingItem of this menu.
void SetSharingItem(SharingItem item);
const base::Optional<SharingItem>& GetSharingItem() const;
const absl::optional<SharingItem>& GetSharingItem() const;
#endif
// ui::SimpleMenuModel:
@ -111,7 +111,7 @@ class ElectronMenuModel : public ui::SimpleMenuModel {
Delegate* delegate_; // weak ref.
#if defined(OS_MAC)
base::Optional<SharingItem> sharing_item_;
absl::optional<SharingItem> sharing_item_;
#endif
std::map<int, std::u16string> toolTips_; // command id -> tooltip

2
shell/browser/ui/file_dialog_gtk.cc
View file

@ -29,7 +29,7 @@
namespace file_dialog {
static GModule* gtk_module;
static base::Optional<bool> supports_gtk_file_chooser_native;
static absl::optional<bool> supports_gtk_file_chooser_native;
using dl_gtk_native_dialog_show_t = void (*)(void*);
using dl_gtk_native_dialog_destroy_t = void (*)(void*);

2
shell/browser/ui/tray_icon.h
View file

@ -18,7 +18,7 @@ namespace electron {
class TrayIcon {
public:
static TrayIcon* Create(base::Optional<UUID> guid);
static TrayIcon* Create(absl::optional<UUID> guid);
#if defined(OS_WIN)
using ImageType = HICON;

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

@ -385,7 +385,7 @@ gfx::Rect TrayIconCocoa::GetBounds() {
}
// static
TrayIcon* TrayIcon::Create(base::Optional<UUID> guid) {
TrayIcon* TrayIcon::Create(absl::optional<UUID> guid) {
return new TrayIconCocoa;
}

2
shell/browser/ui/tray_icon_gtk.cc
View file

@ -66,7 +66,7 @@ bool TrayIconGtk::HasClickAction() {
}
// static
TrayIcon* TrayIcon::Create(base::Optional<UUID> guid) {
TrayIcon* TrayIcon::Create(absl::optional<UUID> guid) {
return new TrayIconGtk;
}

2
shell/browser/ui/tray_icon_win.cc
View file

@ -8,7 +8,7 @@
namespace electron {
// static
TrayIcon* TrayIcon::Create(base::Optional<UUID> guid) {
TrayIcon* TrayIcon::Create(absl::optional<UUID> guid) {
static NotifyIconHost host;
return host.CreateNotifyIcon(guid);
}

8
shell/browser/ui/views/autofill_popup_view.cc
View file

@ -148,8 +148,8 @@ bool AutofillPopupView::CanStartDragForView(views::View*,
}
void AutofillPopupView::OnSelectedRowChanged(
base::Optional<int> previous_row_selection,
base::Optional<int> current_row_selection) {
absl::optional<int> previous_row_selection,
absl::optional<int> current_row_selection) {
SchedulePaint();
if (current_row_selection) {
@ -442,7 +442,7 @@ void AutofillPopupView::AcceptSelection(const gfx::Point& point) {
AcceptSelectedLine();
}
void AutofillPopupView::SetSelectedLine(base::Optional<int> selected_line) {
void AutofillPopupView::SetSelectedLine(absl::optional<int> selected_line) {
if (!popup_)
return;
if (selected_line_ == selected_line)
@ -485,7 +485,7 @@ void AutofillPopupView::SelectPreviousLine() {
}
void AutofillPopupView::ClearSelection() {
SetSelectedLine(base::nullopt);
SetSelectedLine(absl::nullopt);
}
void AutofillPopupView::RemoveObserver() {

10
shell/browser/ui/views/autofill_popup_view.h
View file

@ -9,10 +9,10 @@
#include "shell/browser/ui/autofill_popup.h"
#include "base/optional.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/browser/render_widget_host.h"
#include "electron/buildflags/buildflags.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/views/drag_controller.h"
#include "ui/views/focus/widget_focus_manager.h"
@ -80,8 +80,8 @@ class AutofillPopupView : public views::WidgetDelegateView,
private:
friend class AutofillPopup;
void OnSelectedRowChanged(base::Optional<int> previous_row_selection,
base::Optional<int> current_row_selection);
void OnSelectedRowChanged(absl::optional<int> previous_row_selection,
absl::optional<int> current_row_selection);
// Draw the given autofill entry in |entry_rect|.
void DrawAutofillEntry(gfx::Canvas* canvas,
@ -118,7 +118,7 @@ class AutofillPopupView : public views::WidgetDelegateView,
void AcceptSuggestion(int index);
bool AcceptSelectedLine();
void AcceptSelection(const gfx::Point& point);
void SetSelectedLine(base::Optional<int> selected_line);
void SetSelectedLine(absl::optional<int> selected_line);
void SetSelection(const gfx::Point& point);
void SelectNextLine();
void SelectPreviousLine();
@ -137,7 +137,7 @@ class AutofillPopupView : public views::WidgetDelegateView,
base::Time show_time_;
// The index of the currently selected line
base::Optional<int> selected_line_;
absl::optional<int> selected_line_;
#if BUILDFLAG(ENABLE_OSR)
std::unique_ptr<OffscreenViewProxy> view_proxy_;

1
shell/browser/ui/views/inspectable_web_contents_view_views.cc
View file

@ -43,7 +43,6 @@ class DevToolsWindowDelegate : public views::ClientView,
// views::WidgetDelegate:
void DeleteDelegate() override { delete this; }
views::View* GetInitiallyFocusedView() override { return view_; }
bool CanResize() const override { return true; }
bool CanMaximize() const override { return true; }
bool CanMinimize() const override { return true; }
std::u16string GetWindowTitle() const override { return shell_->GetTitle(); }

2
shell/browser/ui/webui/accessibility_ui.cc
View file

@ -13,7 +13,6 @@
#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/json/json_writer.h"
#include "base/optional.h"
#include "base/strings/pattern.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
@ -41,6 +40,7 @@
#include "net/base/escape.h"
#include "shell/browser/native_window.h"
#include "shell/browser/window_list.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "ui/accessibility/platform/ax_platform_node.h"
#include "ui/accessibility/platform/ax_platform_node_delegate.h"
#include "ui/base/webui/web_ui_util.h"

2
shell/browser/ui/win/notify_icon_host.cc
View file

@ -87,7 +87,7 @@ NotifyIconHost::~NotifyIconHost() {
delete ptr;
}
NotifyIcon* NotifyIconHost::CreateNotifyIcon(base::Optional<UUID> guid) {
NotifyIcon* NotifyIconHost::CreateNotifyIcon(absl::optional<UUID> guid) {
if (guid.has_value()) {
for (NotifyIcons::const_iterator i(notify_icons_.begin());
i != notify_icons_.end(); ++i) {

4
shell/browser/ui/win/notify_icon_host.h
View file

@ -10,8 +10,8 @@
#include <vector>
#include "base/macros.h"
#include "base/optional.h"
#include "shell/common/gin_converters/guid_converter.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
const GUID GUID_DEFAULT = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}};
@ -24,7 +24,7 @@ class NotifyIconHost {
NotifyIconHost();
~NotifyIconHost();
NotifyIcon* CreateNotifyIcon(base::Optional<UUID> guid);
NotifyIcon* CreateNotifyIcon(absl::optional<UUID> guid);
void Remove(NotifyIcon* notify_icon);
private: