mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
56f042f5e5
* chore: bump chromium in DEPS to 110.0.5481.24 * chore: update patches * 4098946: Migrate Extension::Create() argument to base::Value::Dict (part 4 of 4) https://chromium-review.googlesource.com/c/chromium/src/+/4098946 (cherry picked from commit716a0f66f6) * chore: bump chromium in DEPS to 110.0.5481.30 * chore: update patches * chore: cleanup password from keychain after test (cherry picked from commit6c3b0f84c5) * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 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: clavin <clavin@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
Date: Thu, 4 Oct 2018 14:57:02 -0700
|
|
Subject: fix: also propagate fullscreen state for outer frame
|
|
|
|
When entering fullscreen with Element.requestFullscreen in child frames,
|
|
the parent frame should also enter fullscreen mode too. Chromium handles
|
|
this for iframes, but not for webviews as they are essentially main
|
|
frames instead of child frames.
|
|
|
|
This patch makes webviews propagate the fullscreen state to embedder.
|
|
|
|
Note that we also need to manually update embedder's
|
|
`api::WebContents::IsFullscreenForTabOrPending` value.
|
|
|
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
|
index bd60262107b74b6442295d966d2481c798825586..df49f83bc14ae02b40b778697922fc5668af5666 100644
|
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
|
@@ -6555,6 +6555,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
|
}
|
|
}
|
|
|
|
+ // Entering fullscreen from webview should also notify its outer frame.
|
|
+ if (frame_tree_node()->render_manager()->IsMainFrameForInnerDelegate()) {
|
|
+ RenderFrameProxyHost* outer_proxy =
|
|
+ frame_tree_node()->render_manager()->GetProxyToOuterDelegate();
|
|
+ DCHECK(outer_proxy);
|
|
+ if (outer_proxy->is_render_frame_proxy_live()) {
|
|
+ outer_proxy->GetAssociatedRemoteFrame()->WillEnterFullscreen(
|
|
+ options.Clone());
|
|
+ }
|
|
+ }
|
|
+
|
|
// Focus the window if another frame may have delegated the capability.
|
|
if (had_fullscreen_token && !GetView()->HasFocus())
|
|
GetView()->Focus();
|