mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Add |extra_info| parameter for browser creation (fixes issue #1088)
The optional |extra_info| parameter provides an opportunity to specify extra information specific to the created browser that will be passed to CefRenderProcessHandler::OnBrowserCreated() in the render process.
This commit is contained in:
committed by
Marshall Greenblatt
parent
ad4ce5f441
commit
473c29a70d
@@ -9,11 +9,12 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=48d8640bfbc9fede99ac411c163b2717ad84d373$
|
||||
// $hash=efa046db24821251ee93d40d36516d11b915325c$
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/browser_host_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/browser_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/dictionary_value_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/drag_data_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/extension_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/navigation_entry_cpptoc.h"
|
||||
@@ -33,6 +34,7 @@ CEF_EXPORT int cef_browser_host_create_browser(
|
||||
struct _cef_client_t* client,
|
||||
const cef_string_t* url,
|
||||
const struct _cef_browser_settings_t* settings,
|
||||
struct _cef_dictionary_value_t* extra_info,
|
||||
struct _cef_request_context_t* request_context) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
@@ -46,7 +48,7 @@ CEF_EXPORT int cef_browser_host_create_browser(
|
||||
DCHECK(settings);
|
||||
if (!settings)
|
||||
return 0;
|
||||
// Unverified params: client, url, request_context
|
||||
// Unverified params: client, url, extra_info, request_context
|
||||
|
||||
// Translate param: windowInfo; type: struct_byref_const
|
||||
CefWindowInfo windowInfoObj;
|
||||
@@ -60,6 +62,7 @@ CEF_EXPORT int cef_browser_host_create_browser(
|
||||
// Execute
|
||||
bool _retval = CefBrowserHost::CreateBrowser(
|
||||
windowInfoObj, CefClientCToCpp::Wrap(client), CefString(url), settingsObj,
|
||||
CefDictionaryValueCppToC::Unwrap(extra_info),
|
||||
CefRequestContextCppToC::Unwrap(request_context));
|
||||
|
||||
// Return type: bool
|
||||
@@ -71,6 +74,7 @@ CEF_EXPORT cef_browser_t* cef_browser_host_create_browser_sync(
|
||||
struct _cef_client_t* client,
|
||||
const cef_string_t* url,
|
||||
const struct _cef_browser_settings_t* settings,
|
||||
struct _cef_dictionary_value_t* extra_info,
|
||||
struct _cef_request_context_t* request_context) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
@@ -84,7 +88,7 @@ CEF_EXPORT cef_browser_t* cef_browser_host_create_browser_sync(
|
||||
DCHECK(settings);
|
||||
if (!settings)
|
||||
return NULL;
|
||||
// Unverified params: client, url, request_context
|
||||
// Unverified params: client, url, extra_info, request_context
|
||||
|
||||
// Translate param: windowInfo; type: struct_byref_const
|
||||
CefWindowInfo windowInfoObj;
|
||||
@@ -98,6 +102,7 @@ CEF_EXPORT cef_browser_t* cef_browser_host_create_browser_sync(
|
||||
// Execute
|
||||
CefRefPtr<CefBrowser> _retval = CefBrowserHost::CreateBrowserSync(
|
||||
windowInfoObj, CefClientCToCpp::Wrap(client), CefString(url), settingsObj,
|
||||
CefDictionaryValueCppToC::Unwrap(extra_info),
|
||||
CefRequestContextCppToC::Unwrap(request_context));
|
||||
|
||||
// Return type: refptr_same
|
||||
|
@@ -9,12 +9,13 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=90eb7cfa5e3f294b4b732e705ebe53072f22e8e2$
|
||||
// $hash=c6b5f1dca6503df7cb9de7b5351969ad008df340$
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/life_span_handler_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/client_cpptoc.h"
|
||||
#include "libcef_dll/ctocpp/browser_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/dictionary_value_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/frame_ctocpp.h"
|
||||
#include "libcef_dll/shutdown_checker.h"
|
||||
|
||||
@@ -34,6 +35,7 @@ int CEF_CALLBACK life_span_handler_on_before_popup(
|
||||
cef_window_info_t* windowInfo,
|
||||
cef_client_t** client,
|
||||
struct _cef_browser_settings_t* settings,
|
||||
struct _cef_dictionary_value_t** extra_info,
|
||||
int* no_javascript_access) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
@@ -66,6 +68,10 @@ int CEF_CALLBACK life_span_handler_on_before_popup(
|
||||
DCHECK(settings);
|
||||
if (!settings)
|
||||
return 0;
|
||||
// Verify param: extra_info; type: refptr_diff_byref
|
||||
DCHECK(extra_info);
|
||||
if (!extra_info)
|
||||
return 0;
|
||||
// Verify param: no_javascript_access; type: bool_byaddr
|
||||
DCHECK(no_javascript_access);
|
||||
if (!no_javascript_access)
|
||||
@@ -89,6 +95,11 @@ int CEF_CALLBACK life_span_handler_on_before_popup(
|
||||
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: no_javascript_access; type: bool_byaddr
|
||||
bool no_javascript_accessBool =
|
||||
(no_javascript_access && *no_javascript_access) ? true : false;
|
||||
@@ -98,7 +109,7 @@ int CEF_CALLBACK life_span_handler_on_before_popup(
|
||||
CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame),
|
||||
CefString(target_url), CefString(target_frame_name), target_disposition,
|
||||
user_gesture ? true : false, popupFeaturesObj, windowInfoObj, clientPtr,
|
||||
settingsObj, &no_javascript_accessBool);
|
||||
settingsObj, extra_infoPtr, &no_javascript_accessBool);
|
||||
|
||||
// Restore param: windowInfo; type: struct_byref
|
||||
if (windowInfo)
|
||||
@@ -116,6 +127,16 @@ int CEF_CALLBACK life_span_handler_on_before_popup(
|
||||
// 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 = NULL;
|
||||
}
|
||||
}
|
||||
// Restore param: no_javascript_access; type: bool_byaddr
|
||||
if (no_javascript_access)
|
||||
*no_javascript_access = no_javascript_accessBool ? true : false;
|
||||
|
@@ -9,12 +9,13 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=75233e51355652a53c7dcdae740eba004e76605e$
|
||||
// $hash=7b918e87169c8fee39d93a9093ac700eceb6a061$
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/render_process_handler_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/load_handler_cpptoc.h"
|
||||
#include "libcef_dll/ctocpp/browser_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/dictionary_value_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/domnode_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/frame_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/list_value_ctocpp.h"
|
||||
@@ -59,7 +60,8 @@ void CEF_CALLBACK render_process_handler_on_web_kit_initialized(
|
||||
|
||||
void CEF_CALLBACK render_process_handler_on_browser_created(
|
||||
struct _cef_render_process_handler_t* self,
|
||||
cef_browser_t* browser) {
|
||||
cef_browser_t* browser,
|
||||
struct _cef_dictionary_value_t* extra_info) {
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
@@ -69,10 +71,15 @@ void CEF_CALLBACK render_process_handler_on_browser_created(
|
||||
DCHECK(browser);
|
||||
if (!browser)
|
||||
return;
|
||||
// Verify param: extra_info; type: refptr_diff
|
||||
DCHECK(extra_info);
|
||||
if (!extra_info)
|
||||
return;
|
||||
|
||||
// Execute
|
||||
CefRenderProcessHandlerCppToC::Get(self)->OnBrowserCreated(
|
||||
CefBrowserCToCpp::Wrap(browser));
|
||||
CefBrowserCToCpp::Wrap(browser),
|
||||
CefDictionaryValueCToCpp::Wrap(extra_info));
|
||||
}
|
||||
|
||||
void CEF_CALLBACK render_process_handler_on_browser_destroyed(
|
||||
|
@@ -9,11 +9,12 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=c7258f6b27af82d278f8cff4105cfddfebb33658$
|
||||
// $hash=4b17017a80d32d5b9b4968206b6ce22254625d5a$
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/views/browser_view_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/browser_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/dictionary_value_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/request_context_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/views/button_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/views/panel_cpptoc.h"
|
||||
@@ -32,6 +33,7 @@ CEF_EXPORT cef_browser_view_t* cef_browser_view_create(
|
||||
cef_client_t* client,
|
||||
const cef_string_t* url,
|
||||
const struct _cef_browser_settings_t* settings,
|
||||
cef_dictionary_value_t* extra_info,
|
||||
cef_request_context_t* request_context,
|
||||
cef_browser_view_delegate_t* delegate) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
@@ -42,7 +44,7 @@ CEF_EXPORT cef_browser_view_t* cef_browser_view_create(
|
||||
DCHECK(settings);
|
||||
if (!settings)
|
||||
return NULL;
|
||||
// Unverified params: client, url, request_context, delegate
|
||||
// Unverified params: client, url, extra_info, request_context, delegate
|
||||
|
||||
// Translate param: settings; type: struct_byref_const
|
||||
CefBrowserSettings settingsObj;
|
||||
@@ -52,6 +54,7 @@ CEF_EXPORT cef_browser_view_t* cef_browser_view_create(
|
||||
// Execute
|
||||
CefRefPtr<CefBrowserView> _retval = CefBrowserView::CreateBrowserView(
|
||||
CefClientCToCpp::Wrap(client), CefString(url), settingsObj,
|
||||
CefDictionaryValueCppToC::Unwrap(extra_info),
|
||||
CefRequestContextCppToC::Unwrap(request_context),
|
||||
CefBrowserViewDelegateCToCpp::Wrap(delegate));
|
||||
|
||||
|
@@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=1357aad2c8a79a3917ca38d93f3ed84712c2d9cd$
|
||||
// $hash=0516b8b72819ab4b5a9d6f4c68d774ebde06c94c$
|
||||
//
|
||||
|
||||
#include "libcef_dll/ctocpp/browser_host_ctocpp.h"
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "libcef_dll/cpptoc/pdf_print_callback_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h"
|
||||
#include "libcef_dll/ctocpp/browser_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/dictionary_value_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/drag_data_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/extension_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/navigation_entry_ctocpp.h"
|
||||
@@ -34,16 +35,18 @@ bool CefBrowserHost::CreateBrowser(
|
||||
CefRefPtr<CefClient> client,
|
||||
const CefString& url,
|
||||
const CefBrowserSettings& settings,
|
||||
CefRefPtr<CefDictionaryValue> extra_info,
|
||||
CefRefPtr<CefRequestContext> request_context) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
// Unverified params: client, url, request_context
|
||||
// Unverified params: client, url, extra_info, request_context
|
||||
|
||||
// Execute
|
||||
int _retval = cef_browser_host_create_browser(
|
||||
&windowInfo, CefClientCppToC::Wrap(client), url.GetStruct(), &settings,
|
||||
CefDictionaryValueCToCpp::Unwrap(extra_info),
|
||||
CefRequestContextCToCpp::Unwrap(request_context));
|
||||
|
||||
// Return type: bool
|
||||
@@ -56,16 +59,18 @@ CefRefPtr<CefBrowser> CefBrowserHost::CreateBrowserSync(
|
||||
CefRefPtr<CefClient> client,
|
||||
const CefString& url,
|
||||
const CefBrowserSettings& settings,
|
||||
CefRefPtr<CefDictionaryValue> extra_info,
|
||||
CefRefPtr<CefRequestContext> request_context) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
// Unverified params: client, url, request_context
|
||||
// Unverified params: client, url, extra_info, request_context
|
||||
|
||||
// Execute
|
||||
cef_browser_t* _retval = cef_browser_host_create_browser_sync(
|
||||
&windowInfo, CefClientCppToC::Wrap(client), url.GetStruct(), &settings,
|
||||
CefDictionaryValueCToCpp::Unwrap(extra_info),
|
||||
CefRequestContextCToCpp::Unwrap(request_context));
|
||||
|
||||
// Return type: refptr_same
|
||||
@@ -964,8 +969,8 @@ void CefBrowserHostCToCpp::DragSourceSystemDragEnded() {
|
||||
}
|
||||
|
||||
NO_SANITIZE("cfi-icall")
|
||||
CefRefPtr<
|
||||
CefNavigationEntry> CefBrowserHostCToCpp::GetVisibleNavigationEntry() {
|
||||
CefRefPtr<CefNavigationEntry>
|
||||
CefBrowserHostCToCpp::GetVisibleNavigationEntry() {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
cef_browser_host_t* _struct = GetStruct();
|
||||
|
@@ -9,11 +9,12 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=c203333e32d83a2cfdbbf2aa777f377e1b14ed62$
|
||||
// $hash=c90fb460b250ed3b0a8a7f9c1142e51918cedcd5$
|
||||
//
|
||||
|
||||
#include "libcef_dll/ctocpp/life_span_handler_ctocpp.h"
|
||||
#include "libcef_dll/cpptoc/browser_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/dictionary_value_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/frame_cpptoc.h"
|
||||
#include "libcef_dll/ctocpp/client_ctocpp.h"
|
||||
#include "libcef_dll/shutdown_checker.h"
|
||||
@@ -32,6 +33,7 @@ bool CefLifeSpanHandlerCToCpp::OnBeforePopup(
|
||||
CefWindowInfo& windowInfo,
|
||||
CefRefPtr<CefClient>& client,
|
||||
CefBrowserSettings& settings,
|
||||
CefRefPtr<CefDictionaryValue>& extra_info,
|
||||
bool* no_javascript_access) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
@@ -60,6 +62,11 @@ bool CefLifeSpanHandlerCToCpp::OnBeforePopup(
|
||||
if (client.get())
|
||||
clientStruct = CefClientCToCpp::Unwrap(client);
|
||||
cef_client_t* clientOrig = clientStruct;
|
||||
// Translate param: extra_info; type: refptr_diff_byref
|
||||
cef_dictionary_value_t* extra_infoStruct = NULL;
|
||||
if (extra_info.get())
|
||||
extra_infoStruct = CefDictionaryValueCppToC::Wrap(extra_info);
|
||||
cef_dictionary_value_t* extra_infoOrig = extra_infoStruct;
|
||||
// Translate param: no_javascript_access; type: bool_byaddr
|
||||
int no_javascript_accessInt =
|
||||
no_javascript_access ? *no_javascript_access : 0;
|
||||
@@ -69,7 +76,7 @@ bool CefLifeSpanHandlerCToCpp::OnBeforePopup(
|
||||
_struct, CefBrowserCppToC::Wrap(browser), CefFrameCppToC::Wrap(frame),
|
||||
target_url.GetStruct(), target_frame_name.GetStruct(), target_disposition,
|
||||
user_gesture, &popupFeatures, &windowInfo, &clientStruct, &settings,
|
||||
&no_javascript_accessInt);
|
||||
&extra_infoStruct, &no_javascript_accessInt);
|
||||
|
||||
// Restore param:client; type: refptr_same_byref
|
||||
if (clientStruct) {
|
||||
@@ -79,6 +86,14 @@ bool CefLifeSpanHandlerCToCpp::OnBeforePopup(
|
||||
} else {
|
||||
client = NULL;
|
||||
}
|
||||
// Restore param:extra_info; type: refptr_diff_byref
|
||||
if (extra_infoStruct) {
|
||||
if (extra_infoStruct != extra_infoOrig) {
|
||||
extra_info = CefDictionaryValueCppToC::Unwrap(extra_infoStruct);
|
||||
}
|
||||
} else {
|
||||
extra_info = NULL;
|
||||
}
|
||||
// Restore param:no_javascript_access; type: bool_byaddr
|
||||
if (no_javascript_access)
|
||||
*no_javascript_access = no_javascript_accessInt ? true : false;
|
||||
|
@@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=6684419c997eeb24a3b7e646e51f8164aa98694f$
|
||||
// $hash=d9281e31309c3eb8a361dbd33ce16fa6664c27ee$
|
||||
//
|
||||
|
||||
#ifndef CEF_LIBCEF_DLL_CTOCPP_LIFE_SPAN_HANDLER_CTOCPP_H_
|
||||
@@ -47,6 +47,7 @@ class CefLifeSpanHandlerCToCpp
|
||||
CefWindowInfo& windowInfo,
|
||||
CefRefPtr<CefClient>& client,
|
||||
CefBrowserSettings& settings,
|
||||
CefRefPtr<CefDictionaryValue>& extra_info,
|
||||
bool* no_javascript_access) override;
|
||||
void OnAfterCreated(CefRefPtr<CefBrowser> browser) override;
|
||||
bool DoClose(CefRefPtr<CefBrowser> browser) override;
|
||||
|
@@ -9,11 +9,12 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=fd9981ab9019e2386f8546d1aad794f2e5862eef$
|
||||
// $hash=366d6e567451af19ce5a4cc5f6f06791f504af26$
|
||||
//
|
||||
|
||||
#include "libcef_dll/ctocpp/render_process_handler_ctocpp.h"
|
||||
#include "libcef_dll/cpptoc/browser_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/dictionary_value_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/domnode_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/frame_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/list_value_cpptoc.h"
|
||||
@@ -58,7 +59,8 @@ void CefRenderProcessHandlerCToCpp::OnWebKitInitialized() {
|
||||
|
||||
NO_SANITIZE("cfi-icall")
|
||||
void CefRenderProcessHandlerCToCpp::OnBrowserCreated(
|
||||
CefRefPtr<CefBrowser> browser) {
|
||||
CefRefPtr<CefBrowser> browser,
|
||||
CefRefPtr<CefDictionaryValue> extra_info) {
|
||||
cef_render_process_handler_t* _struct = GetStruct();
|
||||
if (CEF_MEMBER_MISSING(_struct, on_browser_created))
|
||||
return;
|
||||
@@ -69,9 +71,14 @@ void CefRenderProcessHandlerCToCpp::OnBrowserCreated(
|
||||
DCHECK(browser.get());
|
||||
if (!browser.get())
|
||||
return;
|
||||
// Verify param: extra_info; type: refptr_diff
|
||||
DCHECK(extra_info.get());
|
||||
if (!extra_info.get())
|
||||
return;
|
||||
|
||||
// Execute
|
||||
_struct->on_browser_created(_struct, CefBrowserCppToC::Wrap(browser));
|
||||
_struct->on_browser_created(_struct, CefBrowserCppToC::Wrap(browser),
|
||||
CefDictionaryValueCppToC::Wrap(extra_info));
|
||||
}
|
||||
|
||||
NO_SANITIZE("cfi-icall")
|
||||
|
@@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=dc669eaed42b1df11eb0df08dc22af0e825a991f$
|
||||
// $hash=c8931d822a351fe827ffd29ba89b888e3e44f6ea$
|
||||
//
|
||||
|
||||
#ifndef CEF_LIBCEF_DLL_CTOCPP_RENDER_PROCESS_HANDLER_CTOCPP_H_
|
||||
@@ -37,7 +37,8 @@ class CefRenderProcessHandlerCToCpp
|
||||
// CefRenderProcessHandler methods.
|
||||
void OnRenderThreadCreated(CefRefPtr<CefListValue> extra_info) override;
|
||||
void OnWebKitInitialized() override;
|
||||
void OnBrowserCreated(CefRefPtr<CefBrowser> browser) override;
|
||||
void OnBrowserCreated(CefRefPtr<CefBrowser> browser,
|
||||
CefRefPtr<CefDictionaryValue> extra_info) override;
|
||||
void OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) override;
|
||||
CefRefPtr<CefLoadHandler> GetLoadHandler() override;
|
||||
void OnContextCreated(CefRefPtr<CefBrowser> browser,
|
||||
|
@@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=034f21943c2bddc00cb1b7da090bef19b6ca6065$
|
||||
// $hash=38a50fce9d7126ab95a471e1de31809792ce50da$
|
||||
//
|
||||
|
||||
#include "libcef_dll/ctocpp/views/browser_view_ctocpp.h"
|
||||
@@ -17,6 +17,7 @@
|
||||
#include "libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h"
|
||||
#include "libcef_dll/ctocpp/browser_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/dictionary_value_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/request_context_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/views/button_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/views/panel_ctocpp.h"
|
||||
@@ -33,17 +34,19 @@ CefRefPtr<CefBrowserView> CefBrowserView::CreateBrowserView(
|
||||
CefRefPtr<CefClient> client,
|
||||
const CefString& url,
|
||||
const CefBrowserSettings& settings,
|
||||
CefRefPtr<CefDictionaryValue> extra_info,
|
||||
CefRefPtr<CefRequestContext> request_context,
|
||||
CefRefPtr<CefBrowserViewDelegate> delegate) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
// Unverified params: client, url, request_context, delegate
|
||||
// Unverified params: client, url, extra_info, request_context, delegate
|
||||
|
||||
// Execute
|
||||
cef_browser_view_t* _retval = cef_browser_view_create(
|
||||
CefClientCppToC::Wrap(client), url.GetStruct(), &settings,
|
||||
CefDictionaryValueCToCpp::Unwrap(extra_info),
|
||||
CefRequestContextCToCpp::Unwrap(request_context),
|
||||
CefBrowserViewDelegateCppToC::Wrap(delegate));
|
||||
|
||||
|
@@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=3639cede4bdba16cae273a2137867f9c5ac53fe8$
|
||||
// $hash=03444846894791bdea24dbd8b059570cda5b801f$
|
||||
//
|
||||
|
||||
#include "include/views/cef_browser_view.h"
|
||||
@@ -30,6 +30,7 @@ CefRefPtr<CefBrowserView> CefBrowserView::CreateBrowserView(
|
||||
CefRefPtr<CefClient> client,
|
||||
const CefString& url,
|
||||
const CefBrowserSettings& settings,
|
||||
CefRefPtr<CefDictionaryValue> extra_info,
|
||||
CefRefPtr<CefRequestContext> request_context,
|
||||
CefRefPtr<CefBrowserViewDelegate> delegate) {
|
||||
NOTIMPLEMENTED();
|
||||
|
@@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=7c87ef36c39355a02bb9544b8228acac7a7abee9$
|
||||
// $hash=436002ae114825124a9a52a24928a974fcf5408a$
|
||||
//
|
||||
|
||||
#include <dlfcn.h>
|
||||
@@ -186,12 +186,14 @@ typedef int (*cef_browser_host_create_browser_ptr)(
|
||||
struct _cef_client_t*,
|
||||
const cef_string_t*,
|
||||
const struct _cef_browser_settings_t*,
|
||||
struct _cef_dictionary_value_t*,
|
||||
struct _cef_request_context_t*);
|
||||
typedef struct _cef_browser_t* (*cef_browser_host_create_browser_sync_ptr)(
|
||||
const struct _cef_window_info_t*,
|
||||
struct _cef_client_t*,
|
||||
const cef_string_t*,
|
||||
const struct _cef_browser_settings_t*,
|
||||
struct _cef_dictionary_value_t*,
|
||||
struct _cef_request_context_t*);
|
||||
typedef struct _cef_command_line_t* (*cef_command_line_create_ptr)();
|
||||
typedef struct _cef_command_line_t* (*cef_command_line_get_global_ptr)();
|
||||
@@ -301,6 +303,7 @@ typedef struct _cef_browser_view_t* (*cef_browser_view_create_ptr)(
|
||||
struct _cef_client_t*,
|
||||
const cef_string_t*,
|
||||
const struct _cef_browser_settings_t*,
|
||||
struct _cef_dictionary_value_t*,
|
||||
struct _cef_request_context_t*,
|
||||
struct _cef_browser_view_delegate_t*);
|
||||
typedef struct _cef_browser_view_t* (*cef_browser_view_get_for_browser_ptr)(
|
||||
@@ -1267,9 +1270,10 @@ int cef_browser_host_create_browser(
|
||||
struct _cef_client_t* client,
|
||||
const cef_string_t* url,
|
||||
const struct _cef_browser_settings_t* settings,
|
||||
struct _cef_dictionary_value_t* extra_info,
|
||||
struct _cef_request_context_t* request_context) {
|
||||
return g_libcef_pointers.cef_browser_host_create_browser(
|
||||
windowInfo, client, url, settings, request_context);
|
||||
windowInfo, client, url, settings, extra_info, request_context);
|
||||
}
|
||||
|
||||
NO_SANITIZE("cfi-icall")
|
||||
@@ -1278,9 +1282,10 @@ struct _cef_browser_t* cef_browser_host_create_browser_sync(
|
||||
struct _cef_client_t* client,
|
||||
const cef_string_t* url,
|
||||
const struct _cef_browser_settings_t* settings,
|
||||
struct _cef_dictionary_value_t* extra_info,
|
||||
struct _cef_request_context_t* request_context) {
|
||||
return g_libcef_pointers.cef_browser_host_create_browser_sync(
|
||||
windowInfo, client, url, settings, request_context);
|
||||
windowInfo, client, url, settings, extra_info, request_context);
|
||||
}
|
||||
|
||||
NO_SANITIZE("cfi-icall") struct _cef_command_line_t* cef_command_line_create() {
|
||||
@@ -1616,10 +1621,11 @@ struct _cef_browser_view_t* cef_browser_view_create(
|
||||
struct _cef_client_t* client,
|
||||
const cef_string_t* url,
|
||||
const struct _cef_browser_settings_t* settings,
|
||||
struct _cef_dictionary_value_t* extra_info,
|
||||
struct _cef_request_context_t* request_context,
|
||||
struct _cef_browser_view_delegate_t* delegate) {
|
||||
return g_libcef_pointers.cef_browser_view_create(client, url, settings,
|
||||
request_context, delegate);
|
||||
return g_libcef_pointers.cef_browser_view_create(
|
||||
client, url, settings, extra_info, request_context, delegate);
|
||||
}
|
||||
|
||||
NO_SANITIZE("cfi-icall")
|
||||
|
Reference in New Issue
Block a user