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

chore: bump chromium to 135.0.7027.0 (main) (#45677)

Browse source 
* chore: bump chromium in DEPS to 135.0.7021.0

* chore: bump chromium in DEPS to 135.0.7023.0

* chore: update patches

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

* [Extensions] Add a BUILD.gn file for the chrome.system.display API.

Refs 6227347

* chore: bump chromium in DEPS to 135.0.7025.0

* fixup! [Extensions] Add a BUILD.gn file for the chrome.system.display API.

* [DevTools] Add support for automatic workspace folders.

Refs 6275926

* Add UseCounter for potential PNA 2.0 breakage

Refs 6259197

* Remove references to NavigationEntry/Controller in Zoom code.

Refs 6258070

* chore: update patches

* Allow DevTools to record UmaHistogramMediumTimes

Refs 6183713

* chore: update patches

* [gpu] Remove unnecessary media_buildflags include

Refs 6286526

* chore: bump chromium in DEPS to 135.0.7027.0

* chore: update patches

* Remove type alias

Refs 6280957

* [Refactor] Make ExtensionRegistrar a browser keyed service.

Refs 6285230

* Remove unused functions

Refs 6278736

* chore: IWYU

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
electron-roller[bot] 2025-02-21 14:46:51 -08:00 • committed by GitHub
parent 6248c2436a
commit 612da3ec47
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
78 changed files with 347 additions and 575 deletions
Download patch file Download diff file Expand all files Collapse all files

28
shell/browser/web_contents_zoom_controller.cc
View file

@ -72,9 +72,6 @@ void WebContentsZoomController::SetEmbedderZoomController(
bool WebContentsZoomController::SetZoomLevel(double level) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
content::NavigationEntry* entry =
web_contents()->GetController().GetLastCommittedEntry();
// Cannot zoom in disabled mode. Also, don't allow changing zoom level on
// a crashed tab, an error page or an interstitial page.
if (zoom_mode_ == ZOOM_MODE_DISABLED ||
@ -116,14 +113,14 @@ bool WebContentsZoomController::SetZoomLevel(double level) {
for (auto& observer : observers_)
observer.OnZoomChanged(zoom_change_data);
} else {
if (!entry) {
const GURL url = content::HostZoomMap::GetURLForRenderFrameHost(rfh_id);
if (url.is_empty()) {
// If we exit without triggering an update, we should clear event_data_,
// else we may later trigger a DCHECK(event_data_).
event_data_.reset();
return false;
}
std::string host =
net::GetHostOrSpecFromURL(content::HostZoomMap::GetURLFromEntry(entry));
std::string host = net::GetHostOrSpecFromURL(url);
zoom_map->SetZoomLevelForHost(host, level);
}
@ -181,11 +178,9 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
switch (new_mode) {
case ZOOM_MODE_DEFAULT: {
content::NavigationEntry* entry =
web_contents()->GetController().GetLastCommittedEntry();
const GURL url = content::HostZoomMap::GetURLForRenderFrameHost(rfh_id);
if (entry) {
GURL url = content::HostZoomMap::GetURLFromEntry(entry);
if (!url.is_empty()) {
const std::string host = net::GetHostOrSpecFromURL(url);
const std::string scheme = url.scheme();
@ -376,14 +371,15 @@ void WebContentsZoomController::OnZoomLevelChanged(
void WebContentsZoomController::UpdateState(const std::string& host) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
auto* rfh = web_contents()->GetPrimaryMainFrame();
// If |host| is empty, all observers should be updated.
if (!host.empty()) {
// Use the navigation entry's URL instead of the WebContents' so virtual
// URLs work (e.g. chrome://settings). http://crbug.com/153950
content::NavigationEntry* entry =
web_contents()->GetController().GetLastCommittedEntry();
if (!entry || host != net::GetHostOrSpecFromURL(
content::HostZoomMap::GetURLFromEntry(entry))) {
// Get the (non-virtual) url to be tracked by the HostZoomMap. Getting urls
// directly from a WebContents may result in a virtual url, so prefer using
// the value from the `rfh` instead, per https://crbug.com/40290372.
const GURL url =
content::HostZoomMap::GetURLForRenderFrameHost(rfh->GetGlobalId());
if (url.is_empty() || host != net::GetHostOrSpecFromURL(url)) {
return;
}
}