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

chore: bump chromium to 100.0.4894.0 (main) (#32852)

Browse source 
* chore: bump chromium in DEPS to 100.0.4880.0

* resolve conflicts

* chore: update patches

* fix patch

* PIP20: add a new DocumentOverlayWindowViews subtype

3252789

* Clean up PictureInPictureWindowManager::EnterPictureInPicture()

3424145

* Remove StoragePartitionId.

2811120

* Remove FLoC code

3424359

* media: Make AddSupportedKeySystems() Async

3430502

* [Extensions] Move some l10n file util methods to //extensions/browser

3408192

* chore: IWYU

* Reland "webhid: Grant permissions for policy-allowed devices"

3444147

* Migrate base::Value::GetList() to base::Value::GetListDeprecated(): 2/N.

3435727
3440910
3440088

* [text blink period] Cache blink period instead of fetching from defaults

3419059

* chore: update picture-in-picture.patch

3252789

* ci: update to Xcode 13.2.1

3437552

* chore: bump chromium in DEPS to 100.0.4882.1

* chore: update patches

* chore: bump chromium in DEPS to 100.0.4884.0

* chore: update patches

* chore: bump chromium in DEPS to 100.0.4886.0

* chore: update patches

* Refactor DownloadManager to use StoragePartitionConfig

3222011

* Remove ToWebInputElement() in favor of new WebNode::DynamicTo<> helpers.

3433852

* refactor: autofill to use the color pipeline

https://bugs.chromium.org/p/chromium/issues/detail?id=1249558
https://bugs.chromium.org/p/chromium/issues/detail?id=1003612

* [ProcessSingleton] Add many more trace events to cover all scenarios

3429325

* fixup! PIP20: add a new DocumentOverlayWindowViews subtype

* chore: bump chromium in DEPS to 100.0.4888.0

* chore: update patches

* chore: update picture-in-picture.patch

* fixup! refactor: autofill to use the color pipeline

* ci: fixup fix sync

(cherry picked from commit c1e3e395465739bce5ca8e1c5ec1f5bd72b99ebd)

* chore: bump chromium in DEPS to 100.0.4889.0

* chore: update patches

* chore: fix feat_add_data_transfer_to_requestsingleinstancelock.patch

* fixup! PIP20: add a new DocumentOverlayWindowViews subtype

* Remove remaining NativeTheme::GetSystemColor() machinery.

3421719

* ci: fetch proper esbuild for macos

* ci: fixup fetch proper esbuild for macos

* fix: failing Node.js test on outdated CurrentValueSerializerFormatVersion

* chore: bump chromium in DEPS to 100.0.4892.0

* 3460365: Set V8 fatal error callbacks during Isolate initialization

3460365

* 3454343: PIP20: use permanent top controls

3454343

* 3465574: Move most of GTK color mixers to ui/color/.

3465574

* chore: fixup patch indices

* 3445327: [locales] Remove locales reference

3445327

* 3456548: [DBB][#7] Blue border falls back to all tab if cropped-to zero pixels

3456548

* 3441196: Convert GuestView's remaining legacy IPC messages to Mojo

3441196

* 3455491: Don't include run_loop.h in thread_task_runner_handle.h

3455491

* fixup! 3454343: PIP20: use permanent top controls

* 3442501: Add missing includes of //base/observer_list.h

3442501

* 3437552: mac: Deploy a new hermetic build of Xcode 13.2.1 13C100

3437552

* chore: bump chromium in DEPS to 100.0.4894.0

* fixup! 3460365: Set V8 fatal error callbacks during Isolate initialization

* chore: update patches

* 3425231: Use DnsOverHttpsConfig where appropriate

3425231

* test: disable test-heapsnapshot-near-heap-limit-worker.js

As a result of CLs linked in https://bugs.chromium.org/p/v8/issues/detail?id=12503,
heap snapshotting near the heap limit DCHECKS in Node.js specs. This will
likely require a larger refactor in Node.js so i've disabled the test for
now and opened an upstream issue on node-v8 issue
at https://github.com/nodejs/node-v8/issues/218.

* Port all usage of NativeTheme color IDs to color pipeline

https://bugs.chromium.org/p/chromium/issues/detail?id=1249558

* chore: update patches after rebase

* ci: use gen2 machine for more disk space

* ci: don't try to make root volume writeable

* ci: use older xcode/macos for tests

* fix: html fullscreen transitions stacking

(cherry picked from commit 5e10965cdd7b2a024def5fc568912cefd0f05b44)

* ci: speed up woa testing

(cherry picked from commit 75c33c48b032137794f5734348a9ee3daa60d9de)
(cherry picked from commit e81996234029669663bf0daaababd34684dcbb17)

* ci: disable flaky tests on WOA

* ci: run remote tests separately to isolate issue there

* tests: disable node test parallel/test-worker-debug for now

* revert: fix: html fullscreen transitions stacking

* tests: disable flaky test on macOS arm64

* fixup circleci config so build tools can find xcode version

* make sure the workspace is clean before job runs

(cherry picked from commit 75f713c9748ac1a356846c39f268886130554fd6)

* tests: disable flaky test on Linux

* ci: debug why windows i32 is crashing

* Revert "ci: debug why windows i32 is crashing"

This reverts commit 4c4bba87ea76f16ef3b304dadff59ad4d366f60f.

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
electron-roller[bot] 2022-02-25 13:17:35 -05:00 • committed by GitHub
parent c1a667c931
commit 3da598015b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
135 changed files with 1038 additions and 852 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
#include "shell/browser/native_window.h"
#include "shell/browser/ui/views/submenu_button.h"
#include "ui/color/color_provider.h"
#include "ui/native_theme/common_theme.h"
#include "ui/views/background.h"
#include "ui/views/layout/box_layout.h"
@ -34,10 +35,13 @@ const char MenuBar::kViewClassName[] = "ElectronMenuBar";
MenuBar::MenuBar(NativeWindow* window, RootView* root_view)
: background_color_(kDefaultColor), window_(window), root_view_(root_view) {
const ui::NativeTheme* theme = root_view_->GetNativeTheme();
if (theme) {
RefreshColorCache(theme);
}
RefreshColorCache(theme);
UpdateViewColors();
#if BUILDFLAG(IS_WIN)
SetBackground(
views::CreateThemedSolidBackground(this, ui::kColorMenuBackground));
background_color_ = GetBackground()->get_color();
#endif
SetFocusBehavior(FocusBehavior::ALWAYS);
SetLayoutManager(std::make_unique<views::BoxLayout>(
views::BoxLayout::Orientation::kHorizontal));
@ -156,9 +160,7 @@ bool MenuBar::SetPaneFocusAndFocusDefault() {
void MenuBar::OnThemeChanged() {
views::AccessiblePaneView::OnThemeChanged();
const ui::NativeTheme* theme = root_view_->GetNativeTheme();
if (theme) {
RefreshColorCache(theme);
}
RefreshColorCache(theme);
UpdateViewColors();
}
@ -215,9 +217,6 @@ void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) {
gtk::GetFgColor("GtkMenuBar#menubar GtkMenuItem#menuitem GtkLabel");
disabled_color_ = gtk::GetFgColor(
"GtkMenuBar#menubar GtkMenuItem#menuitem:disabled GtkLabel");
#else
background_color_ =
ui::GetAuraColor(ui::NativeTheme::kColorId_MenuBackgroundColor, theme);
#endif
}
}
@ -235,8 +234,10 @@ void MenuBar::RebuildChildren() {
}
void MenuBar::UpdateViewColors() {
#if BUILDFLAG(IS_LINUX)
// set menubar background color
SetBackground(views::CreateSolidBackground(background_color_));
#endif
// set child colors
if (menu_model_ == nullptr)