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

chore: bump chromium to 123.0.6312.5 (30-x-y) (#41402)

Browse source 
* chore: bump chromium in DEPS to 123.0.6300.2

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>

* chore: bump chromium in DEPS to 123.0.6301.2

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>

* chore: update patches

Co-authored-by: deepak1556 <hop2deep@gmail.com>

* chore: bump chromium in DEPS to 123.0.6302.0

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>

* chore: bump chromium in DEPS to 123.0.6304.0

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>

* chore: bump chromium in DEPS to 123.0.6306.2

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>

* chore: bump chromium in DEPS to 123.0.6308.0

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>

* Refactor //components/pdf/common constants

5292816

Co-authored-by: deepak1556 <hop2deep@gmail.com>

* Rename URLLoaderFactoryParams::is_corb_enabled to is_orb_enabled.

Refs 5277040

Co-authored-by: deepak1556 <hop2deep@gmail.com>

* Add placeholder of speaker-selection permission.

Refs 5278243

Co-authored-by: deepak1556 <hop2deep@gmail.com>

* Move kPdfMimeType to //components/pdf/common/constants.h

Refs 5293155

Co-authored-by: deepak1556 <hop2deep@gmail.com>

* chore: gen-libc++-filenames.js

Co-authored-by: deepak1556 <hop2deep@gmail.com>

* Make GetClassName non virtual

Refs 5293075
Refs https://issues.chromium.org/issues/324596267

Co-authored-by: deepak1556 <hop2deep@gmail.com>

* chore: bump chromium in DEPS to 123.0.6310.0

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>

* chore: update filenames.libcxx.gni

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

* 5282732: Compute input region using correct pixel size.

5282732

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

* fixup: Make GetClassName non virtual

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

* chore: bump chromium in DEPS to 123.0.6312.0

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>

* chore: bump chromium in DEPS to 123.0.6312.5

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>

* fixup: Make GetClassName non virtual

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

* docs: document speaker-selection

5278243

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
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:
trop[bot] 2024-02-22 10:29:09 -05:00 • committed by GitHub
parent 25b0212fe6
commit 532039ea2c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
73 changed files with 257 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/app/electron_content_client.cc
View file

@ -40,7 +40,7 @@
#if BUILDFLAG(ENABLE_PDF_VIEWER)
#include "chrome/common/pdf_util.h"
#include "components/pdf/common/internal_plugin_helpers.h"
#include "components/pdf/common/constants.h"
#include "pdf/pdf.h" // nogncheck
#include "shell/common/electron_constants.h"
#endif // BUILDFLAG(ENABLE_PDF_VIEWER)

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

@ -198,7 +198,7 @@ UtilityProcessWrapper::UtilityProcessWrapper(
network::mojom::URLLoaderFactoryParamsPtr loader_params =
network::mojom::URLLoaderFactoryParams::New();
loader_params->process_id = pid_;
loader_params->is_corb_enabled = false;
loader_params->is_orb_enabled = false;
loader_params->is_trusted = true;
network::mojom::NetworkContext* network_context =
g_browser_process->system_network_context_manager()->GetContext();

4
shell/browser/electron_browser_client.cc
View file

@ -214,7 +214,7 @@
#include "components/pdf/browser/pdf_document_helper.h" // nogncheck
#include "components/pdf/browser/pdf_navigation_throttle.h"
#include "components/pdf/browser/pdf_url_loader_request_interceptor.h"
#include "components/pdf/common/internal_plugin_helpers.h"
#include "components/pdf/common/constants.h"
#include "shell/browser/electron_pdf_document_helper_client.h"
#endif
@ -1397,7 +1397,7 @@ void ElectronBrowserClient::OverrideURLLoaderFactoryParams(
auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
auto* prefs = WebContentsPreferences::From(web_contents);
if (prefs && !prefs->IsWebSecurityEnabled()) {
factory_params->is_corb_enabled = false;
factory_params->is_orb_enabled = false;
factory_params->disable_web_security = true;
}
}

2
shell/browser/electron_browser_context.cc
View file

@ -479,7 +479,7 @@ ElectronBrowserContext::GetURLLoaderFactory() {
params->header_client = std::move(header_client);
params->process_id = network::mojom::kBrowserProcessId;
params->is_trusted = true;
params->is_corb_enabled = false;
params->is_orb_enabled = false;
// The tests of net module would fail if this setting is true, it seems that
// the non-NetworkService implementation always has web security enabled.
params->disable_web_security = false;

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

@ -168,7 +168,7 @@ SystemNetworkContextManager::GetURLLoaderFactory() {
network::mojom::URLLoaderFactoryParamsPtr params =
network::mojom::URLLoaderFactoryParams::New();
params->process_id = network::mojom::kBrowserProcessId;
params->is_corb_enabled = false;
params->is_orb_enabled = false;
url_loader_factory_.reset();
GetContext()->CreateURLLoaderFactory(
url_loader_factory_.BindNewPipeAndPassReceiver(), std::move(params));

3
shell/browser/ui/electron_desktop_window_tree_host_linux.cc
View file

@ -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

11
shell/browser/ui/views/client_frame_view_linux.cc
View file

@ -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

5
shell/browser/ui/views/client_frame_view_linux.h
View file

@ -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;

9
shell/browser/ui/views/frameless_view.cc
View file

@ -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

5
shell/browser/ui/views/frameless_view.h
View file

@ -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;

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

@ -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());

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

@ -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);

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

@ -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

5
shell/browser/ui/views/native_frame_view.h
View file

@ -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.

10
shell/browser/ui/views/win_frame_view.cc
View file

@ -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

7
shell/browser/ui/views/win_frame_view.h
View file

@ -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() {

2
shell/common/gin_converters/content_converter.cc
View file

@ -259,6 +259,8 @@ v8::Local<v8::Value> Converter<blink::PermissionType>::ToV8(
return StringToV8(isolate, "smart-card");
case blink::PermissionType::WEB_PRINTING:
return StringToV8(isolate, "web-printing");
case blink::PermissionType::SPEAKER_SELECTION:
return StringToV8(isolate, "speaker-selection");
case blink::PermissionType::NUM:
break;
}

5
shell/common/plugin_info.cc
View file

@ -6,7 +6,7 @@
#if BUILDFLAG(ENABLE_PDF_VIEWER)
#include "base/strings/utf_string_conversions.h"
#include "chrome/common/pdf_util.h"
#include "components/pdf/common/constants.h"
#include "extensions/common/constants.h"
#include "shell/common/electron_constants.h"
#endif // BUILDFLAG(ENABLE_PDF_VIEWER)
@ -31,7 +31,8 @@ content::WebPluginInfo GetPDFPluginInfo() {
// This isn't a real file path; it's just used as a unique identifier.
info.path = base::FilePath::FromUTF8Unsafe(extension_misc::kPdfExtensionId);
info.background_color = content::WebPluginInfo::kDefaultBackgroundColor;
info.mime_types.emplace_back(kPDFMimeType, "pdf", "Portable Document Format");
info.mime_types.emplace_back(pdf::kPDFMimeType, "pdf",
"Portable Document Format");
return info;
}
#endif // BUILDFLAG(ENABLE_PDF_VIEWER)

2
shell/renderer/renderer_client_base.cc
View file

@ -69,7 +69,7 @@
#if BUILDFLAG(ENABLE_PDF_VIEWER)
#include "chrome/common/pdf_util.h"
#include "components/pdf/common/internal_plugin_helpers.h"
#include "components/pdf/common/constants.h"
#include "components/pdf/renderer/pdf_internal_plugin_delegate.h"
#include "shell/common/electron_constants.h"
#endif // BUILDFLAG(ENABLE_PDF_VIEWER)