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

fix: account for BrowserView bounds in setting autofill popup bounds (#38489)

Browse source
This commit is contained in:
Shelley Vohr 2023-06-06 10:21:42 +02:00 committed by GitHub
parent bb2ba35b51
commit b2059f288a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
shell/browser/electron_autofill_driver.cc
View file

@ -11,6 +11,7 @@
#include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/render_widget_host_view.h"
#include "shell/browser/api/electron_api_web_contents.h" #include "shell/browser/api/electron_api_web_contents.h"
#include "shell/browser/javascript_environment.h" #include "shell/browser/javascript_environment.h"
#include "shell/browser/native_browser_view.h"
#include "shell/browser/native_window.h" #include "shell/browser/native_window.h"
namespace electron { namespace electron {
@ -36,7 +37,11 @@ void AutofillDriver::ShowAutofillPopup(
v8::HandleScope scope(isolate); v8::HandleScope scope(isolate);
auto* web_contents = api::WebContents::From( auto* web_contents = api::WebContents::From(
content::WebContents::FromRenderFrameHost(render_frame_host_)); content::WebContents::FromRenderFrameHost(render_frame_host_));
if (!web_contents || !web_contents->owner_window()) if (!web_contents)
return;
auto* owner_window = web_contents->owner_window();
if (!owner_window)
return; return;
auto* embedder = web_contents->embedder(); auto* embedder = web_contents->embedder();
@ -55,9 +60,23 @@ void AutofillDriver::ShowAutofillPopup(
embedder_frame_host = embedder->web_contents()->GetPrimaryMainFrame(); embedder_frame_host = embedder->web_contents()->GetPrimaryMainFrame();
} }
// Ensure that if the WebContents belongs to a BrowserView,
// the popup is positioned relative to the BrowserView's bounds.
for (NativeBrowserView* bv : owner_window->browser_views()) {
auto* iwc = bv->GetInspectableWebContents();
if (!iwc)
continue;
auto* awc = api::WebContents::From(iwc->GetWebContents());
if (awc == web_contents) {
auto bv_origin = bv->GetBounds().origin();
popup_bounds.Offset(gfx::Vector2dF(bv_origin.x(), bv_origin.y()));
break;
}
}
autofill_popup_->CreateView(render_frame_host_, embedder_frame_host, osr, autofill_popup_->CreateView(render_frame_host_, embedder_frame_host, osr,
web_contents->owner_window()->content_view(), owner_window->content_view(), popup_bounds);
popup_bounds);
autofill_popup_->SetItems(values, labels); autofill_popup_->SetItems(values, labels);
} }