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

chore: bump chromium to 94.0.4590.2 (main) (#30274)

Browse source 
* chore: bump chromium in DEPS to 94.0.4587.0

* chore: update patches

* 2823155: fix GPU video decoding capabilities enumeration

Ref: 2823155

* 3041383: Reduce includes in url_request_mojom_traits.h

Ref: 3041383

* chore: bump chromium in DEPS to 94.0.4588.0

* chore: update patches

* chore: bump chromium in DEPS to 94.0.4589.0

* chore: update patches

* 3050633: Rename ScaleFactor to ResourceScaleFactor

Ref: 3050633

* 3048296: Create new mojo target to prevent traits header spreading

Ref: 3048296

* 3046186: Rename base::ClampToRange

Ref: 3046186

* chore: update picture-in-picture patch

Ref: 3056037

* chore: bump chromium in DEPS to 94.0.4590.0

* chore: update patches

* 3057495: Fix base::NoDestructor usage in Mac KeychainPassword

Ref: 3057495

* 3056134: Remove NetworkIsolationKey unused methods

Ref: 3056134

* 3035091: [rab/gsab] Fix gsab maxByteLength after transferring to worker

Adds a patch to v8 to disable a DCHECK that is also firing on node streams
in child processes.

Ref: 3035091

* chore: bump chromium in DEPS to 94.0.4590.2

* chore: fix mas_no_private_api.patch

Ref: 3049052

* 3049555: [views] Add CHECK to prevent fallthrough to global NativeTheme

Ref: 3049555

* chore: empty commit

* chore: fix whitespace for lint

* chore: cherry-pick chromium woa fix

* Revert "chore: cherry-pick chromium woa fix"

This reverts commit 64f3082e2d5f93ef0e2ac5d98246532a105fd4a1.

* chore: fix the build on Windows on ARM

* chore: remove commented code in printing.patch

* fixup! chore: remove commented code in printing.patch

do not remove the new weak_ptr check

* build: sync disable_use_lld_for_macos.patch

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
electron-roller[bot] 2021-08-11 17:04:56 -04:00 • committed by GitHub
parent c8f3324610
commit 81c143318b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
64 changed files with 386 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/api/gpuinfo_manager.cc
View file

@ -67,7 +67,7 @@ void GPUInfoManager::CompleteInfoFetcher(
complete_info_promise_set_.emplace_back(std::move(promise));
if (NeedsCompleteGpuInfoCollection()) {
gpu_data_manager_->RequestDxdiagDx12VulkanGpuInfoIfNeeded(
gpu_data_manager_->RequestDxdiagDx12VulkanVideoGpuInfoIfNeeded(
content::GpuDataManagerImpl::kGpuInfoRequestAll, /* delayed */ false);
} else {
GPUInfoManager::OnGpuInfoUpdate();

1
shell/browser/electron_browser_context.h
View file

@ -15,6 +15,7 @@
#include "content/public/browser/browser_context.h"
#include "content/public/browser/resource_context.h"
#include "electron/buildflags/buildflags.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/network/public/mojom/network_context.mojom.h"
#include "services/network/public/mojom/url_loader_factory.mojom.h"
#include "shell/browser/media/media_device_id_salt.h"

1
shell/browser/extensions/electron_extensions_browser_client.h
View file

@ -15,6 +15,7 @@
#include "extensions/browser/extensions_browser_client.h"
#include "extensions/browser/kiosk/kiosk_delegate.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/mojom/fetch_api.mojom.h"
class PrefService;

4
shell/browser/native_window_mac.mm
View file

@ -12,9 +12,9 @@
#include <utility>
#include <vector>
#include "base/cxx17_backports.h"
#include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/numerics/ranges.h"
#include "base/strings/sys_string_conversions.h"
#include "base/task/post_task.h"
#include "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h"
@ -1099,7 +1099,7 @@ bool NativeWindowMac::HasShadow() {
}
void NativeWindowMac::SetOpacity(const double opacity) {
const double boundedOpacity = base::ClampToRange(opacity, 0.0, 1.0);
const double boundedOpacity = base::clamp(opacity, 0.0, 1.0);
[window_ setAlphaValue:boundedOpacity];
}

4
shell/browser/native_window_views.cc
View file

@ -12,7 +12,7 @@
#include <utility>
#include <vector>
#include "base/numerics/ranges.h"
#include "base/cxx17_backports.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "content/public/browser/browser_thread.h"
@ -1056,7 +1056,7 @@ bool NativeWindowViews::HasShadow() {
void NativeWindowViews::SetOpacity(const double opacity) {
#if defined(OS_WIN)
const double boundedOpacity = base::ClampToRange(opacity, 0.0, 1.0);
const double boundedOpacity = base::clamp(opacity, 0.0, 1.0);
HWND hwnd = GetAcceleratedWidget();
if (!layered_) {
LONG ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE);

1
shell/browser/net/asar/asar_url_loader.h
View file

@ -6,6 +6,7 @@
#define SHELL_BROWSER_NET_ASAR_ASAR_URL_LOADER_H_
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/mojom/url_loader.mojom.h"
namespace asar {

1
shell/browser/net/electron_url_loader_factory.h
View file

@ -15,6 +15,7 @@
#include "mojo/public/cpp/bindings/receiver_set.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "net/url_request/url_request_job_factory.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/cpp/self_deleting_url_loader_factory.h"
#include "services/network/public/mojom/url_loader.mojom.h"
#include "services/network/public/mojom/url_loader_factory.mojom.h"

2
shell/browser/net/resolve_proxy_helper.cc
View file

@ -56,7 +56,7 @@ void ResolveProxyHelper::StartPendingRequest() {
browser_context_->GetDefaultStoragePartition()
->GetNetworkContext()
->LookUpProxyForURL(pending_requests_.front().url,
net::NetworkIsolationKey::Todo(),
net::NetworkIsolationKey(),
std::move(proxy_lookup_client));
}

4
shell/browser/net/system_network_context_manager.cc
View file

@ -240,8 +240,8 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(
std::string app_name = electron::Browser::Get()->GetName();
#if defined(OS_MAC)
*KeychainPassword::service_name = app_name + " Safe Storage";
*KeychainPassword::account_name = app_name;
KeychainPassword::GetServiceName() = app_name + " Safe Storage";
KeychainPassword::GetAccountName() = app_name;
#endif
#if defined(OS_LINUX)
// c.f.

2
shell/browser/net/url_pipe_loader.h
View file

@ -9,9 +9,11 @@
#include <string>
#include <vector>
#include "base/values.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "mojo/public/cpp/system/data_pipe_producer.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/cpp/simple_url_loader.h"
#include "services/network/public/cpp/simple_url_loader_stream_consumer.h"
#include "services/network/public/mojom/url_loader.mojom.h"

13
shell/browser/ui/views/menu_bar.cc
View file

@ -33,7 +33,10 @@ const char MenuBar::kViewClassName[] = "ElectronMenuBar";
MenuBar::MenuBar(NativeWindow* window, RootView* root_view)
: background_color_(kDefaultColor), window_(window), root_view_(root_view) {
RefreshColorCache();
const ui::NativeTheme* theme = root_view_->GetNativeTheme();
if (theme) {
RefreshColorCache(theme);
}
UpdateViewColors();
SetFocusBehavior(FocusBehavior::ALWAYS);
SetLayoutManager(std::make_unique<views::BoxLayout>(
@ -147,7 +150,10 @@ bool MenuBar::SetPaneFocusAndFocusDefault() {
void MenuBar::OnThemeChanged() {
views::AccessiblePaneView::OnThemeChanged();
RefreshColorCache();
const ui::NativeTheme* theme = root_view_->GetNativeTheme();
if (theme) {
RefreshColorCache(theme);
}
UpdateViewColors();
}
@ -196,8 +202,7 @@ void MenuBar::ButtonPressed(int id, const ui::Event& event) {
menu_delegate->AddObserver(this);
}
void MenuBar::RefreshColorCache() {
const ui::NativeTheme* theme = GetNativeTheme();
void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) {
if (theme) {
#if defined(OS_LINUX)
background_color_ = gtk::GetBgColor("GtkMenuBar#menubar");

2
shell/browser/ui/views/menu_bar.h
View file

@ -70,7 +70,7 @@ class MenuBar : public views::AccessiblePaneView,
void RebuildChildren();
void UpdateViewColors();
void RefreshColorCache();
void RefreshColorCache(const ui::NativeTheme* theme);
View* FindAccelChild(char16_t key);
SkColor background_color_;