fix: adjust initial webContents focus calculation (#29204)
* fix: adjust initial webContents focus calculation * fix: active window check on mac * fix: about:blank focus behavior * chore: add spec Co-authored-by: Raymond Zhao <raymondzhao@microsoft.com>
This commit is contained in:
parent
014bdc9f8a
commit
77297f37a3
10 changed files with 70 additions and 28 deletions
|
@ -701,8 +701,8 @@ WebContents::WebContents(v8::Isolate* isolate,
|
|||
// BrowserViews are not attached to a window initially so they should start
|
||||
// off as hidden. This is also important for compositor recycling. See:
|
||||
// https://github.com/electron/electron/pull/21372
|
||||
initially_shown_ = type_ != Type::kBrowserView;
|
||||
options.Get(options::kShow, &initially_shown_);
|
||||
bool initially_shown = type_ != Type::kBrowserView;
|
||||
options.Get(options::kShow, &initially_shown);
|
||||
|
||||
// Obtain the session.
|
||||
std::string partition;
|
||||
|
@ -758,7 +758,7 @@ WebContents::WebContents(v8::Isolate* isolate,
|
|||
#endif
|
||||
} else {
|
||||
content::WebContents::CreateParams params(session->browser_context());
|
||||
params.initially_hidden = !initially_shown_;
|
||||
params.initially_hidden = !initially_shown;
|
||||
web_contents = content::WebContents::Create(params);
|
||||
}
|
||||
|
||||
|
@ -1650,6 +1650,27 @@ void WebContents::DidRedirectNavigation(
|
|||
EmitNavigationEvent("did-redirect-navigation", navigation_handle);
|
||||
}
|
||||
|
||||
void WebContents::ReadyToCommitNavigation(
|
||||
content::NavigationHandle* navigation_handle) {
|
||||
// Don't focus content in an inactive window.
|
||||
if (!owner_window())
|
||||
return;
|
||||
#if defined(OS_MAC)
|
||||
if (!owner_window()->IsActive())
|
||||
return;
|
||||
#else
|
||||
if (!owner_window()->widget()->IsActive())
|
||||
return;
|
||||
#endif
|
||||
// Don't focus content after subframe navigations.
|
||||
if (!navigation_handle->IsInMainFrame())
|
||||
return;
|
||||
// Only focus for top-level contents.
|
||||
if (type_ != Type::kBrowserWindow)
|
||||
return;
|
||||
web_contents()->SetInitialFocus();
|
||||
}
|
||||
|
||||
void WebContents::DidFinishNavigation(
|
||||
content::NavigationHandle* navigation_handle) {
|
||||
if (!navigation_handle->HasCommitted())
|
||||
|
@ -3110,10 +3131,6 @@ v8::Local<v8::Value> WebContents::Debugger(v8::Isolate* isolate) {
|
|||
return v8::Local<v8::Value>::New(isolate, debugger_);
|
||||
}
|
||||
|
||||
bool WebContents::WasInitiallyShown() {
|
||||
return initially_shown_;
|
||||
}
|
||||
|
||||
content::RenderFrameHost* WebContents::MainFrame() {
|
||||
return web_contents()->GetMainFrame();
|
||||
}
|
||||
|
@ -3683,7 +3700,6 @@ v8::Local<v8::ObjectTemplate> WebContents::FillObjectTemplate(
|
|||
.SetProperty("hostWebContents", &WebContents::HostWebContents)
|
||||
.SetProperty("devToolsWebContents", &WebContents::DevToolsWebContents)
|
||||
.SetProperty("debugger", &WebContents::Debugger)
|
||||
.SetProperty("_initiallyShown", &WebContents::WasInitiallyShown)
|
||||
.SetProperty("mainFrame", &WebContents::MainFrame)
|
||||
.Build();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue