bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add notification for aborted popups (fixes #3776)

Browse Source 
Pass a new |popup_id| parameter to OnBeforePopup and call a new
OnBeforePopupAborted callback if the popup is aborted before
OnAfterCreated is called for the popup browser. Add new
CefBrowserHost::GetBrowserByIdentifier and GetOpenerIdentifier
methods to assist with retrieval of associated browsers.

In cefclient, clean up state when a popup is aborted and close
any associated popup browsers when the opener browser is closed.
This also works when running with `--use-default-popup`.
This commit is contained in:
Marshall Greenblatt
2024-11-08 19:05:04 -05:00
parent b91be9fcc9
commit 1a99a3abc5
45 changed files with 773 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/cefclient/browser/root_window_manager.h
View File

@@ -6,6 +6,7 @@
#define CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_MANAGER_H_
#pragma once
#include <map>
#include <memory>
#include <set>
@@ -40,12 +41,18 @@ class RootWindowManager : public RootWindow::Delegate {
bool use_alloy_style,
bool with_controls,
bool with_osr,
int opener_browser_id,
int popup_id,
bool is_devtools,
const CefPopupFeatures& popupFeatures,
CefWindowInfo& windowInfo,
CefRefPtr<CefClient>& client,
CefBrowserSettings& settings);
// Abort or close the popup matching the specified identifiers. If |popup_id|
// is -1 then all popups for |opener_browser_id| will be impacted.
void AbortOrClosePopup(int opener_browser_id, int popup_id);
// Returns the RootWindow associated with the specified browser ID. Must be
// called on the main thread.
scoped_refptr<RootWindow> GetWindowForBrowser(int browser_id) const;
@@ -63,8 +70,11 @@ class RootWindowManager : public RootWindow::Delegate {
}
// Track other browsers that are not directly associated with a RootWindow.
void OtherBrowserCreated();
void OtherBrowserClosed();
// This may be an overlay browser, a popup created with `--use-default-popup`,
// or a browser using default Chrome UI. |opener_browser_id| will be > 0 for
// popup browsers.
void OtherBrowserCreated(int browser_id, int opener_browser_id);
void OtherBrowserClosed(int browser_id, int opener_browser_id);
private:
// Allow deletion via std::unique_ptr only.
@@ -73,6 +83,7 @@ class RootWindowManager : public RootWindow::Delegate {
~RootWindowManager() override;
void OnRootWindowCreated(scoped_refptr<RootWindow> root_window);
void OnAbortOrClosePopup(int opener_browser_id, int popup_id);
// RootWindow::Delegate methods.
CefRefPtr<CefRequestContext> GetRequestContext() override;
@@ -95,12 +106,19 @@ class RootWindowManager : public RootWindow::Delegate {
bool request_context_shared_cache_;
// Existing root windows. Only accessed on the main thread.
typedef std::set<scoped_refptr<RootWindow>> RootWindowSet;
using RootWindowSet = std::set<scoped_refptr<RootWindow>>;
RootWindowSet root_windows_;
// Count of other browsers. Only accessed on the main thread.
// Count of browsers that are not directly associated with a RootWindow. Only
// accessed on the main thread.
int other_browser_ct_ = 0;
// Map of owner browser ID to popup browser IDs for popups that don't have a
// RootWindow. Only accessed on the main thread.
using BrowserIdSet = std::set<int>;
using BrowserOwnerMap = std::map<int, BrowserIdSet>;
BrowserOwnerMap other_browser_owners_;
// The currently active/foreground RootWindow. Only accessed on the main
// thread.
scoped_refptr<RootWindow> active_root_window_;