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

fix: webview zoom level persistence on navigation (#40650)

Browse source
This commit is contained in:
Shelley Vohr 2023-12-04 16:39:20 +01:00 • committed by GitHub
parent 66b4b21646
commit 10a165a9ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 72 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
shell/browser/web_contents_zoom_controller.cc
View file

@ -74,6 +74,7 @@ bool WebContentsZoomController::SetZoomLevel(double level) {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
content::NavigationEntry* entry = content::NavigationEntry* entry =
web_contents()->GetController().GetLastCommittedEntry(); web_contents()->GetController().GetLastCommittedEntry();
// Cannot zoom in disabled mode. Also, don't allow changing zoom level on // Cannot zoom in disabled mode. Also, don't allow changing zoom level on
// a crashed tab, an error page or an interstitial page. // a crashed tab, an error page or an interstitial page.
if (zoom_mode_ == ZOOM_MODE_DISABLED || if (zoom_mode_ == ZOOM_MODE_DISABLED ||
@ -90,7 +91,7 @@ bool WebContentsZoomController::SetZoomLevel(double level) {
zoom_level_ = level; zoom_level_ = level;
ZoomChangedEventData zoom_change_data(web_contents(), old_zoom_level, ZoomChangedEventData zoom_change_data(web_contents(), old_zoom_level,
zoom_level_, false /* temporary */, zoom_level_, true /* temporary */,
zoom_mode_); zoom_mode_);
for (auto& observer : observers_) for (auto& observer : observers_)
observer.OnZoomChanged(zoom_change_data); observer.OnZoomChanged(zoom_change_data);
@ -154,7 +155,7 @@ void WebContentsZoomController::SetTemporaryZoomLevel(double level) {
// Notify observers of zoom level changes. // Notify observers of zoom level changes.
ZoomChangedEventData zoom_change_data(web_contents(), zoom_level_, level, ZoomChangedEventData zoom_change_data(web_contents(), zoom_level_, level,
true /* temporary */, zoom_mode_); true /* temporary */, zoom_mode_);
for (WebContentsZoomObserver& observer : observers_) for (auto& observer : observers_)
observer.OnZoomChanged(zoom_change_data); observer.OnZoomChanged(zoom_change_data);
} }
@ -268,8 +269,10 @@ void WebContentsZoomController::ResetZoomModeOnNavigationIfNeeded(
double old_zoom_level = zoom_map->GetZoomLevel(web_contents()); double old_zoom_level = zoom_map->GetZoomLevel(web_contents());
double new_zoom_level = zoom_map->GetZoomLevelForHostAndScheme( double new_zoom_level = zoom_map->GetZoomLevelForHostAndScheme(
url.scheme(), net::GetHostOrSpecFromURL(url)); url.scheme(), net::GetHostOrSpecFromURL(url));
event_data_ = std::make_unique<ZoomChangedEventData>( event_data_ = std::make_unique<ZoomChangedEventData>(
web_contents(), old_zoom_level, new_zoom_level, false, ZOOM_MODE_DEFAULT); web_contents(), old_zoom_level, new_zoom_level, false, ZOOM_MODE_DEFAULT);
// The call to ClearTemporaryZoomLevel() doesn't generate any events from // The call to ClearTemporaryZoomLevel() doesn't generate any events from
// HostZoomMap, but the call to UpdateState() at the end of // HostZoomMap, but the call to UpdateState() at the end of
// DidFinishNavigation will notify our observers. // DidFinishNavigation will notify our observers.
@ -295,11 +298,12 @@ void WebContentsZoomController::DidFinishNavigation(
if (!navigation_handle->IsSameDocument()) { if (!navigation_handle->IsSameDocument()) {
ResetZoomModeOnNavigationIfNeeded(navigation_handle->GetURL()); ResetZoomModeOnNavigationIfNeeded(navigation_handle->GetURL());
SetZoomFactorOnNavigationIfNeeded(navigation_handle->GetURL()); SetZoomFactorOnNavigationIfNeeded(navigation_handle->GetURL());
// If the main frame's content has changed, the new page may have a
// different zoom level from the old one.
UpdateState(std::string());
} }
// If the main frame's content has changed, the new page may have a different
// zoom level from the old one.
UpdateState(std::string());
DCHECK(!event_data_); DCHECK(!event_data_);
} }

31
spec/fixtures/pages/webview-zoom-change-persist-host.html vendored Normal file
View file

@ -0,0 +1,31 @@
<html>
<body>
<webview nodeintegration src="app://host1" id="view" partition="webview-temp" />
</body>
<script>
const { ipcRenderer, webFrame } = require('electron')
const view = document.getElementById('view')
let values = {
initialZoomLevel: 0,
switchZoomLevel: 0,
finalZoomLevel: 0,
}
view.addEventListener('dom-ready', async () => {
view.setZoomLevel(2.0)
values.initialZoomLevel = view.getZoomLevel()
await view.loadURL('app://host2')
view.setZoomLevel(3.0)
values.switchZoomLevel = view.getZoomLevel()
await view.loadURL('app://host1')
values.finalZoomLevel = view.getZoomLevel()
ipcRenderer.send('webview-zoom-persist-level', values)
})
</script>
</html>

8
spec/node-spec.ts
View file

@ -873,7 +873,13 @@ describe('node feature', () => {
}); });
}; };
process.once('unhandledRejection', () => done(new Error('catch block is delayed to next tick'))); let called = false;
process.once('unhandledRejection', () => {
if (called) return;
done(new Error('catch block is delayed to next tick'));
called = true;
});
setTimeout(() => { setTimeout(() => {
f3().catch(() => done()); f3().catch(() => done());

25
spec/webview-spec.ts
View file

@ -353,6 +353,31 @@ describe('<webview> tag', function () {
expect(zoomLevel).to.equal(1); expect(zoomLevel).to.equal(1);
}); });
it('maintains the zoom level for a given host in the same session after navigation', () => {
const w = new BrowserWindow({
show: false,
webPreferences: {
webviewTag: true,
nodeIntegration: true,
contextIsolation: false
}
});
const zoomPromise = new Promise<void>((resolve) => {
ipcMain.on('webview-zoom-persist-level', (_event, values) => {
resolve(values);
});
});
w.loadFile(path.join(fixtures, 'pages', 'webview-zoom-change-persist-host.html'));
expect(zoomPromise).to.eventually.deep.equal({
initialZoomLevel: 2,
switchZoomLevel: 3,
finalZoomLevel: 2
});
});
it('maintains zoom level on navigation', async () => { it('maintains zoom level on navigation', async () => {
const w = new BrowserWindow({ const w = new BrowserWindow({
show: false, show: false,