github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 111.0.5563.50 (24-x-y) (#37223)

Browse Source 
* chore: bump chromium in DEPS to 111.0.5563.19

* chore: bump chromium in DEPS to 111.0.5563.33

* chore: bump chromium in DEPS to 111.0.5563.41

* chore: update patches

* refactor: remove GetFontLookupTableCacheDir

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4191820
(cherry picked from commit 52740f127f)

* chore: remove dead DecodeToken code

(cherry picked from commit e7ac425771)

* chore: add stub impls for WCO routing

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/4182690
(cherry picked from commit 911e353b07)

* refacotr: switch mojom::NetworkHintsHandler to use SchemeHostPair instead of URL

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4185417
(cherry picked from commit a8b3befdd7)

* chore: bump chromium in DEPS to 111.0.5563.50

* chore: update patches

* 4240360: [intl] Revert date formatting behavior change from ICU 72

https://chromium-review.googlesource.com/c/v8/v8/+/4240360

* chore: update patches

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Samuel Attard <marshallofsound@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
electron-roller[bot]
2023-03-02 20:22:57 -05:00
committed by GitHub
parent 03285c8faf
commit 29ced1215a
56 changed files with 206 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shell/browser/electron_browser_client.cc
View File

@@ -1514,13 +1514,6 @@ std::string ElectronBrowserClient::GetApplicationLocale() {
return *g_application_locale;
}
base::FilePath ElectronBrowserClient::GetFontLookupTableCacheDir() {
base::FilePath user_data_dir;
base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
DCHECK(!user_data_dir.empty());
return user_data_dir.Append(FILE_PATH_LITERAL("FontLookupTableCache"));
}
bool ElectronBrowserClient::ShouldEnableStrictSiteIsolation() {
// Enable site isolation. It is off by default in Chromium <= 69.
return true;

1
shell/browser/electron_browser_client.h
View File

@@ -71,7 +71,6 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
// content::ContentBrowserClient:
std::string GetApplicationLocale() override;
base::FilePath GetFontLookupTableCacheDir() override;
bool ShouldEnableStrictSiteIsolation() override;
void BindHostReceiverForRenderer(
content::RenderProcessHost* render_process_host,

4
shell/browser/network_hints_handler_impl.cc
View File

@@ -25,7 +25,7 @@ NetworkHintsHandlerImpl::NetworkHintsHandlerImpl(
NetworkHintsHandlerImpl::~NetworkHintsHandlerImpl() = default;
void NetworkHintsHandlerImpl::Preconnect(const GURL& url,
void NetworkHintsHandlerImpl::Preconnect(const url::SchemeHostPort& url,
bool allow_credentials) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -34,7 +34,7 @@ void NetworkHintsHandlerImpl::Preconnect(const GURL& url,
}
auto* session = electron::api::Session::FromBrowserContext(browser_context_);
if (session) {
session->Emit("preconnect", url, allow_credentials);
session->Emit("preconnect", url.GetURL(), allow_credentials);
}
}

3
shell/browser/network_hints_handler_impl.h
View File

@@ -23,7 +23,8 @@ class NetworkHintsHandlerImpl
receiver);
// network_hints::mojom::NetworkHintsHandler:
void Preconnect(const GURL& url, bool allow_credentials) override;
void Preconnect(const url::SchemeHostPort& url,
bool allow_credentials) override;
private:
explicit NetworkHintsHandlerImpl(content::RenderFrameHost*);

3
shell/browser/osr/osr_web_contents_view.cc
View File

@@ -220,4 +220,7 @@ OffScreenRenderWidgetHostView* OffScreenWebContentsView::GetView() const {
void OffScreenWebContentsView::FullscreenStateChanged(bool is_fullscreen) {}
void OffScreenWebContentsView::UpdateWindowControlsOverlay(
const gfx::Rect& bounding_rect) {}
} // namespace electron

1
shell/browser/osr/osr_web_contents_view.h
View File

@@ -64,6 +64,7 @@ class OffScreenWebContentsView : public content::WebContentsView,
void SetOverscrollControllerEnabled(bool enabled) override;
void OnCapturerCountChanged() override;
void FullscreenStateChanged(bool is_fullscreen) override;
void UpdateWindowControlsOverlay(const gfx::Rect& bounding_rect) override;
#if BUILDFLAG(IS_MAC)
bool CloseTabAfterEventTrackingIfNeeded() override;

11
shell/browser/serial/serial_chooser_context.cc
View File

@@ -46,17 +46,6 @@ std::string EncodeToken(const base::UnguessableToken& token) {
return buffer;
}
base::UnguessableToken DecodeToken(base::StringPiece input) {
std::string buffer;
if (!base::Base64Decode(input, &buffer) ||
buffer.length() != sizeof(uint64_t) * 2) {
return base::UnguessableToken();
}
const uint64_t* data = reinterpret_cast<const uint64_t*>(buffer.data());
return base::UnguessableToken::Deserialize(data[0], data[1]);
}
base::Value PortInfoToValue(const device::mojom::SerialPortInfo& port) {
base::Value::Dict value;
if (port.display_name && !port.display_name->empty())