chrome: Support Chrome and DevTools command execution (fixes #3282, fixes #3600)

Add new CefBrowserHost::[Can]ExecuteChromeCommand methods for executing
arbitrary Chrome commands.

Add support for existing CefBrowserHost::ShowDevTools, CloseDevTools and
HasDevTools methods.

DevTools windows now support the same Views callbacks as normal popup
windows with the new CefLifeSpanHandler::OnBeforeDevToolsPopup callback
as the DevTools-specific equivalent of OnBeforePopup.

Always create DevTools as an undocked window to support use of
ShowDevTools with default Chrome browser windows.

To test:

Run `ceftests --enable-chrome-runtime [--use-views]
     --gtest_filter=V8Test.OnUncaughtExceptionDevTools`

OR:

1. Run `cefclient --enable-chrome-runtime [--use-native]`
2. Select "Show DevTools", "Close DevTools" or "Inspect" from the
   right-click menu.
3. Notice that the DevTools window is Views-hosted (or native-hosted)
   and works as expected.

Add --use-default-popup to get a default styled popup in step 3.
This commit is contained in:
Marshall Greenblatt
2023-11-14 17:16:43 +00:00
parent d3d465b32e
commit 53ef570f57
50 changed files with 1173 additions and 240 deletions

View File

@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=5358aa617ebb6d7d074e2d346599fbd6777f1770$
// $hash=a5c3b05b23c536eba7ce2e7242c3840e93729b29$
//
#include "libcef_dll/cpptoc/browser_host_cpptoc.h"
@ -1468,6 +1468,44 @@ void CEF_CALLBACK browser_host_exit_fullscreen(struct _cef_browser_host_t* self,
: false);
}
int CEF_CALLBACK
browser_host_can_execute_chrome_command(struct _cef_browser_host_t* self,
int command_id) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return 0;
}
// Execute
bool _retval =
CefBrowserHostCppToC::Get(self)->CanExecuteChromeCommand(command_id);
// Return type: bool
return _retval;
}
void CEF_CALLBACK
browser_host_execute_chrome_command(struct _cef_browser_host_t* self,
int command_id,
cef_window_open_disposition_t disposition) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return;
}
// Execute
CefBrowserHostCppToC::Get(self)->ExecuteChromeCommand(command_id,
disposition);
}
} // namespace
// CONSTRUCTOR - Do not edit by hand.
@ -1547,6 +1585,9 @@ CefBrowserHostCppToC::CefBrowserHostCppToC() {
GetStruct()->is_audio_muted = browser_host_is_audio_muted;
GetStruct()->is_fullscreen = browser_host_is_fullscreen;
GetStruct()->exit_fullscreen = browser_host_exit_fullscreen;
GetStruct()->can_execute_chrome_command =
browser_host_can_execute_chrome_command;
GetStruct()->execute_chrome_command = browser_host_execute_chrome_command;
}
// DESTRUCTOR - Do not edit by hand.

View File

@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=e96fe0660b55afa20c3bb5fdebc85635ccc53d09$
// $hash=4990c06888649a2cb06ba7028f16f9cd762f3ad0$
//
#include "libcef_dll/cpptoc/life_span_handler_cpptoc.h"
@ -169,6 +169,126 @@ int CEF_CALLBACK life_span_handler_on_before_popup(
return _retval;
}
void CEF_CALLBACK life_span_handler_on_before_dev_tools_popup(
struct _cef_life_span_handler_t* self,
cef_browser_t* browser,
cef_window_info_t* windowInfo,
cef_client_t** client,
struct _cef_browser_settings_t* settings,
struct _cef_dictionary_value_t** extra_info,
int* use_default_window) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return;
}
// Verify param: browser; type: refptr_diff
DCHECK(browser);
if (!browser) {
return;
}
// Verify param: windowInfo; type: struct_byref
DCHECK(windowInfo);
if (!windowInfo) {
return;
}
if (!template_util::has_valid_size(windowInfo)) {
DCHECK(false) << "invalid windowInfo->[base.]size";
return;
}
// Verify param: client; type: refptr_same_byref
DCHECK(client);
if (!client) {
return;
}
// Verify param: settings; type: struct_byref
DCHECK(settings);
if (!settings) {
return;
}
if (!template_util::has_valid_size(settings)) {
DCHECK(false) << "invalid settings->[base.]size";
return;
}
// Verify param: extra_info; type: refptr_diff_byref
DCHECK(extra_info);
if (!extra_info) {
return;
}
// Verify param: use_default_window; type: bool_byaddr
DCHECK(use_default_window);
if (!use_default_window) {
return;
}
// Translate param: windowInfo; type: struct_byref
CefWindowInfo windowInfoObj;
if (windowInfo) {
windowInfoObj.AttachTo(*windowInfo);
}
// Translate param: client; type: refptr_same_byref
CefRefPtr<CefClient> clientPtr;
if (client && *client) {
clientPtr = CefClientCppToC::Unwrap(*client);
}
CefClient* clientOrig = clientPtr.get();
// Translate param: settings; type: struct_byref
CefBrowserSettings settingsObj;
if (settings) {
settingsObj.AttachTo(*settings);
}
// Translate param: extra_info; type: refptr_diff_byref
CefRefPtr<CefDictionaryValue> extra_infoPtr;
if (extra_info && *extra_info) {
extra_infoPtr = CefDictionaryValueCToCpp::Wrap(*extra_info);
}
CefDictionaryValue* extra_infoOrig = extra_infoPtr.get();
// Translate param: use_default_window; type: bool_byaddr
bool use_default_windowBool =
(use_default_window && *use_default_window) ? true : false;
// Execute
CefLifeSpanHandlerCppToC::Get(self)->OnBeforeDevToolsPopup(
CefBrowserCToCpp::Wrap(browser), windowInfoObj, clientPtr, settingsObj,
extra_infoPtr, &use_default_windowBool);
// Restore param: windowInfo; type: struct_byref
if (windowInfo) {
windowInfoObj.DetachTo(*windowInfo);
}
// Restore param: client; type: refptr_same_byref
if (client) {
if (clientPtr.get()) {
if (clientPtr.get() != clientOrig) {
*client = CefClientCppToC::Wrap(clientPtr);
}
} else {
*client = nullptr;
}
}
// Restore param: settings; type: struct_byref
if (settings) {
settingsObj.DetachTo(*settings);
}
// Restore param: extra_info; type: refptr_diff_byref
if (extra_info) {
if (extra_infoPtr.get()) {
if (extra_infoPtr.get() != extra_infoOrig) {
*extra_info = CefDictionaryValueCToCpp::Unwrap(extra_infoPtr);
}
} else {
*extra_info = nullptr;
}
}
// Restore param: use_default_window; type: bool_byaddr
if (use_default_window) {
*use_default_window = use_default_windowBool ? true : false;
}
}
void CEF_CALLBACK
life_span_handler_on_after_created(struct _cef_life_span_handler_t* self,
cef_browser_t* browser) {
@ -244,6 +364,8 @@ life_span_handler_on_before_close(struct _cef_life_span_handler_t* self,
CefLifeSpanHandlerCppToC::CefLifeSpanHandlerCppToC() {
GetStruct()->on_before_popup = life_span_handler_on_before_popup;
GetStruct()->on_before_dev_tools_popup =
life_span_handler_on_before_dev_tools_popup;
GetStruct()->on_after_created = life_span_handler_on_after_created;
GetStruct()->do_close = life_span_handler_do_close;
GetStruct()->on_before_close = life_span_handler_on_before_close;