mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: bump chromium to 123.0.6312.5 (main) (#41337)
* chore: bump chromium in DEPS to 123.0.6300.2 * chore: bump chromium in DEPS to 123.0.6301.2 * chore: update patches * chore: bump chromium in DEPS to 123.0.6302.0 * chore: bump chromium in DEPS to 123.0.6304.0 * chore: update patches * chore: bump chromium in DEPS to 123.0.6306.2 * chore: update patches * chore: bump chromium in DEPS to 123.0.6308.0 * chore: update patches * Refactor //components/pdf/common constants https://chromium-review.googlesource.com/c/chromium/src/+/5292816 * Rename URLLoaderFactoryParams::is_corb_enabled to is_orb_enabled. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5277040 * Add placeholder of speaker-selection permission. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5278243 * Move kPdfMimeType to //components/pdf/common/constants.h Refs https://chromium-review.googlesource.com/c/chromium/src/+/5293155 * chore: gen-libc++-filenames.js * Make GetClassName non virtual Refs https://chromium-review.googlesource.com/c/chromium/src/+/5293075 Refs https://issues.chromium.org/issues/324596267 * chore: bump chromium in DEPS to 123.0.6310.0 * chore: update filenames.libcxx.gni * 5282732: Compute input region using correct pixel size. https://chromium-review.googlesource.com/c/chromium/src/+/5282732 * fixup: Make GetClassName non virtual * chore: bump chromium in DEPS to 123.0.6312.0 * chore: update patches * chore: bump chromium in DEPS to 123.0.6312.5 * fixup: Make GetClassName non virtual * docs: document speaker-selection https://chromium-review.googlesource.com/c/chromium/src/+/5278243 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.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:
committed by
GitHub
parent
f350cce64f
commit
e72f4f7f26
@@ -176,7 +176,8 @@ void ElectronDesktopWindowTreeHostLinux::UpdateClientDecorationHints(
|
||||
|
||||
gfx::Rect input_bounds(view->GetWidget()->GetWindowBoundsInScreen().size());
|
||||
input_bounds.Inset(insets + input_insets);
|
||||
window->SetInputRegion(gfx::ScaleToEnclosingRect(input_bounds, scale));
|
||||
window->SetInputRegion(std::optional<std::vector<gfx::Rect>>(
|
||||
{gfx::ScaleToEnclosingRect(input_bounds, scale)}));
|
||||
|
||||
if (should_set_opaque_region) {
|
||||
// The opaque region is a list of rectangles that contain only fully
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
#include "shell/browser/ui/views/frameless_view.h"
|
||||
#include "ui/base/hit_test.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
#include "ui/base/metadata/metadata_impl_macros.h"
|
||||
#include "ui/base/models/image_model.h"
|
||||
#include "ui/gfx/canvas.h"
|
||||
#include "ui/gfx/font_list.h"
|
||||
@@ -63,9 +64,6 @@ ui::NavButtonProvider::ButtonState ButtonStateToNavButtonProviderState(
|
||||
|
||||
} // namespace
|
||||
|
||||
// static
|
||||
const char ClientFrameViewLinux::kViewClassName[] = "ClientFrameView";
|
||||
|
||||
ClientFrameViewLinux::ClientFrameViewLinux()
|
||||
: theme_(ui::NativeTheme::GetInstanceForNativeUi()),
|
||||
nav_button_provider_(
|
||||
@@ -310,10 +308,6 @@ void ClientFrameViewLinux::OnPaint(gfx::Canvas* canvas) {
|
||||
}
|
||||
}
|
||||
|
||||
const char* ClientFrameViewLinux::GetClassName() const {
|
||||
return kViewClassName;
|
||||
}
|
||||
|
||||
void ClientFrameViewLinux::PaintAsActiveChanged() {
|
||||
UpdateThemeValues();
|
||||
}
|
||||
@@ -507,4 +501,7 @@ views::View* ClientFrameViewLinux::TargetForRect(views::View* root,
|
||||
return views::NonClientFrameView::TargetForRect(root, rect);
|
||||
}
|
||||
|
||||
BEGIN_METADATA(ClientFrameViewLinux)
|
||||
END_METADATA
|
||||
|
||||
} // namespace electron
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
#include "base/memory/raw_ptr_exclusion.h"
|
||||
#include "base/scoped_observation.h"
|
||||
#include "shell/browser/ui/views/frameless_view.h"
|
||||
#include "ui/base/metadata/metadata_header_macros.h"
|
||||
#include "ui/base/ui_base_types.h"
|
||||
#include "ui/linux/linux_ui.h"
|
||||
#include "ui/linux/nav_button_provider.h"
|
||||
@@ -30,8 +31,9 @@ namespace electron {
|
||||
class ClientFrameViewLinux : public FramelessView,
|
||||
public ui::NativeThemeObserver,
|
||||
public ui::WindowButtonOrderObserver {
|
||||
METADATA_HEADER(ClientFrameViewLinux, FramelessView)
|
||||
|
||||
public:
|
||||
static const char kViewClassName[];
|
||||
ClientFrameViewLinux();
|
||||
~ClientFrameViewLinux() override;
|
||||
|
||||
@@ -73,7 +75,6 @@ class ClientFrameViewLinux : public FramelessView,
|
||||
gfx::Size GetMaximumSize() const override;
|
||||
void Layout(PassKey) override;
|
||||
void OnPaint(gfx::Canvas* canvas) override;
|
||||
const char* GetClassName() const override;
|
||||
|
||||
// Overriden from views::ViewTargeterDelegate
|
||||
views::View* TargetForRect(views::View* root, const gfx::Rect& rect) override;
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
#include "shell/browser/ui/views/inspectable_web_contents_view_views.h"
|
||||
#include "ui/aura/window.h"
|
||||
#include "ui/base/hit_test.h"
|
||||
#include "ui/base/metadata/metadata_impl_macros.h"
|
||||
#include "ui/views/widget/widget.h"
|
||||
#include "ui/views/widget/widget_delegate.h"
|
||||
|
||||
@@ -20,9 +21,6 @@ const int kResizeAreaCornerSize = 16;
|
||||
|
||||
} // namespace
|
||||
|
||||
// static
|
||||
const char FramelessView::kViewClassName[] = "FramelessView";
|
||||
|
||||
FramelessView::FramelessView() = default;
|
||||
|
||||
FramelessView::~FramelessView() = default;
|
||||
@@ -129,8 +127,7 @@ gfx::Size FramelessView::GetMaximumSize() const {
|
||||
return size.IsEmpty() ? gfx::Size(INT_MAX, INT_MAX) : size;
|
||||
}
|
||||
|
||||
const char* FramelessView::GetClassName() const {
|
||||
return kViewClassName;
|
||||
}
|
||||
BEGIN_METADATA(FramelessView)
|
||||
END_METADATA
|
||||
|
||||
} // namespace electron
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
#define ELECTRON_SHELL_BROWSER_UI_VIEWS_FRAMELESS_VIEW_H_
|
||||
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "ui/base/metadata/metadata_header_macros.h"
|
||||
#include "ui/views/window/non_client_view.h"
|
||||
|
||||
namespace views {
|
||||
@@ -17,8 +18,9 @@ namespace electron {
|
||||
class NativeWindowViews;
|
||||
|
||||
class FramelessView : public views::NonClientFrameView {
|
||||
METADATA_HEADER(FramelessView, views::NonClientFrameView)
|
||||
|
||||
public:
|
||||
static const char kViewClassName[];
|
||||
FramelessView();
|
||||
~FramelessView() override;
|
||||
|
||||
@@ -55,7 +57,6 @@ class FramelessView : public views::NonClientFrameView {
|
||||
gfx::Size CalculatePreferredSize() const override;
|
||||
gfx::Size GetMinimumSize() const override;
|
||||
gfx::Size GetMaximumSize() const override;
|
||||
const char* GetClassName() const override;
|
||||
|
||||
// Not owned.
|
||||
raw_ptr<NativeWindowViews> window_ = nullptr;
|
||||
|
||||
@@ -167,10 +167,6 @@ void MenuBar::OnDidChangeFocus(View* focused_before, View* focused_now) {
|
||||
root_view_->RestoreFocus();
|
||||
}
|
||||
|
||||
const char* MenuBar::GetClassName() const {
|
||||
return kViewClassName;
|
||||
}
|
||||
|
||||
void MenuBar::ButtonPressed(size_t id, const ui::Event& event) {
|
||||
// Hide the accelerator when a submenu is activated.
|
||||
SetAcceleratorVisibility(pane_has_focus());
|
||||
|
||||
@@ -74,7 +74,6 @@ class MenuBar : public views::AccessiblePaneView,
|
||||
void OnDidChangeFocus(View* focused_before, View* focused_now) override;
|
||||
|
||||
// views::View:
|
||||
const char* GetClassName() const override;
|
||||
void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
|
||||
|
||||
void ButtonPressed(size_t id, const ui::Event& event);
|
||||
|
||||
@@ -5,11 +5,10 @@
|
||||
#include "shell/browser/ui/views/native_frame_view.h"
|
||||
|
||||
#include "shell/browser/native_window.h"
|
||||
#include "ui/base/metadata/metadata_impl_macros.h"
|
||||
|
||||
namespace electron {
|
||||
|
||||
const char NativeFrameView::kViewClassName[] = "ElectronNativeFrameView";
|
||||
|
||||
NativeFrameView::NativeFrameView(NativeWindow* window, views::Widget* widget)
|
||||
: views::NativeFrameView(widget), window_(window) {}
|
||||
|
||||
@@ -24,8 +23,7 @@ gfx::Size NativeFrameView::GetMaximumSize() const {
|
||||
return size.IsEmpty() ? gfx::Size(INT_MAX, INT_MAX) : size;
|
||||
}
|
||||
|
||||
const char* NativeFrameView::GetClassName() const {
|
||||
return kViewClassName;
|
||||
}
|
||||
BEGIN_METADATA(NativeFrameView)
|
||||
END_METADATA
|
||||
|
||||
} // namespace electron
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
#define ELECTRON_SHELL_BROWSER_UI_VIEWS_NATIVE_FRAME_VIEW_H_
|
||||
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "ui/base/metadata/metadata_header_macros.h"
|
||||
#include "ui/views/window/native_frame_view.h"
|
||||
|
||||
namespace electron {
|
||||
@@ -15,8 +16,9 @@ class NativeWindow;
|
||||
// Like the views::NativeFrameView, but returns the min/max size from the
|
||||
// NativeWindowViews.
|
||||
class NativeFrameView : public views::NativeFrameView {
|
||||
METADATA_HEADER(NativeFrameView, views::NativeFrameView)
|
||||
|
||||
public:
|
||||
static const char kViewClassName[];
|
||||
NativeFrameView(NativeWindow* window, views::Widget* widget);
|
||||
|
||||
// disable copy
|
||||
@@ -27,7 +29,6 @@ class NativeFrameView : public views::NativeFrameView {
|
||||
// views::View:
|
||||
gfx::Size GetMinimumSize() const override;
|
||||
gfx::Size GetMaximumSize() const override;
|
||||
const char* GetClassName() const override;
|
||||
|
||||
private:
|
||||
raw_ptr<NativeWindow> window_; // weak ref.
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
#include "base/win/windows_version.h"
|
||||
#include "shell/browser/native_window_views.h"
|
||||
#include "shell/browser/ui/views/win_caption_button_container.h"
|
||||
#include "ui/base/metadata/metadata_impl_macros.h"
|
||||
#include "ui/base/win/hwnd_metrics.h"
|
||||
#include "ui/display/win/dpi.h"
|
||||
#include "ui/display/win/screen_win.h"
|
||||
@@ -25,8 +26,6 @@
|
||||
|
||||
namespace electron {
|
||||
|
||||
const char WinFrameView::kViewClassName[] = "WinFrameView";
|
||||
|
||||
WinFrameView::WinFrameView() = default;
|
||||
|
||||
WinFrameView::~WinFrameView() = default;
|
||||
@@ -165,10 +164,6 @@ int WinFrameView::NonClientHitTest(const gfx::Point& point) {
|
||||
return FramelessView::NonClientHitTest(point);
|
||||
}
|
||||
|
||||
const char* WinFrameView::GetClassName() const {
|
||||
return kViewClassName;
|
||||
}
|
||||
|
||||
bool WinFrameView::IsMaximized() const {
|
||||
return frame()->IsMaximized();
|
||||
}
|
||||
@@ -294,4 +289,7 @@ void WinFrameView::LayoutWindowControlsOverlay() {
|
||||
window()->NotifyLayoutWindowControlsOverlay();
|
||||
}
|
||||
|
||||
BEGIN_METADATA(WinFrameView)
|
||||
END_METADATA
|
||||
|
||||
} // namespace electron
|
||||
|
||||
@@ -14,12 +14,14 @@
|
||||
#include "shell/browser/ui/views/frameless_view.h"
|
||||
#include "shell/browser/ui/views/win_caption_button.h"
|
||||
#include "shell/browser/ui/views/win_caption_button_container.h"
|
||||
#include "ui/base/metadata/metadata_header_macros.h"
|
||||
|
||||
namespace electron {
|
||||
|
||||
class WinFrameView : public FramelessView {
|
||||
METADATA_HEADER(WinFrameView, FramelessView)
|
||||
|
||||
public:
|
||||
static const char kViewClassName[];
|
||||
WinFrameView();
|
||||
~WinFrameView() override;
|
||||
|
||||
@@ -39,9 +41,6 @@ class WinFrameView : public FramelessView {
|
||||
const gfx::Rect& client_bounds) const override;
|
||||
int NonClientHitTest(const gfx::Point& point) override;
|
||||
|
||||
// views::View:
|
||||
const char* GetClassName() const override;
|
||||
|
||||
NativeWindowViews* window() const { return window_; }
|
||||
views::Widget* frame() const { return frame_; }
|
||||
WinCaptionButtonContainer* caption_button_container() {
|
||||
|
||||
Reference in New Issue
Block a user