Update include/ comments to Doxygen formatting (see issue #3384)

See related guidelines in the issue.
This commit is contained in:
Marshall Greenblatt
2022-08-31 22:03:04 -04:00
parent 7b352159df
commit d7a153bdd4
235 changed files with 11484 additions and 11274 deletions

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=306e44d49ab6198a0fa1bcea50e8a25ee18672be$ // $hash=6bdc0ce413420b45510fcc7f415c6a6fb05f0112$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_ACCESSIBILITY_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_ACCESSIBILITY_HANDLER_CAPI_H_
@ -47,27 +47,27 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to receive accessibility notification when /// Implement this structure to receive accessibility notification when
// accessibility events have been registered. The functions of this structure /// accessibility events have been registered. The functions of this structure
// will be called on the UI thread. /// will be called on the UI thread.
/// ///
typedef struct _cef_accessibility_handler_t { typedef struct _cef_accessibility_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called after renderer process sends accessibility tree changes to the /// Called after renderer process sends accessibility tree changes to the
// browser process. /// browser process.
/// ///
void(CEF_CALLBACK* on_accessibility_tree_change)( void(CEF_CALLBACK* on_accessibility_tree_change)(
struct _cef_accessibility_handler_t* self, struct _cef_accessibility_handler_t* self,
struct _cef_value_t* value); struct _cef_value_t* value);
/// ///
// Called after renderer process sends accessibility location changes to the /// Called after renderer process sends accessibility location changes to the
// browser process. /// browser process.
/// ///
void(CEF_CALLBACK* on_accessibility_location_change)( void(CEF_CALLBACK* on_accessibility_location_change)(
struct _cef_accessibility_handler_t* self, struct _cef_accessibility_handler_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=84440a43cf4be6728b51919e65c5f33e5736c502$ // $hash=7c6894aae3e508aaa42a376532328316d9bd509c$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_APP_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_APP_CAPI_H_
@ -54,25 +54,26 @@ extern "C" {
struct _cef_app_t; struct _cef_app_t;
/// ///
// Implement this structure to provide handler implementations. Methods will be /// Implement this structure to provide handler implementations. Methods will be
// called by the process and/or thread indicated. /// called by the process and/or thread indicated.
/// ///
typedef struct _cef_app_t { typedef struct _cef_app_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Provides an opportunity to view and/or modify command-line arguments before /// Provides an opportunity to view and/or modify command-line arguments
// processing by CEF and Chromium. The |process_type| value will be NULL for /// before processing by CEF and Chromium. The |process_type| value will be
// the browser process. Do not keep a reference to the cef_command_line_t /// NULL for the browser process. Do not keep a reference to the
// object passed to this function. The CefSettings.command_line_args_disabled /// cef_command_line_t object passed to this function. The
// value can be used to start with an NULL command-line object. Any values /// cef_settings_t.command_line_args_disabled value can be used to start with
// specified in CefSettings that equate to command-line arguments will be set /// an NULL command-line object. Any values specified in CefSettings that
// before this function is called. Be cautious when using this function to /// equate to command-line arguments will be set before this function is
// modify command-line arguments for non-browser processes as this may result /// called. Be cautious when using this function to modify command-line
// in undefined behavior including crashes. /// arguments for non-browser processes as this may result in undefined
/// behavior including crashes.
/// ///
void(CEF_CALLBACK* on_before_command_line_processing)( void(CEF_CALLBACK* on_before_command_line_processing)(
struct _cef_app_t* self, struct _cef_app_t* self,
@ -80,61 +81,62 @@ typedef struct _cef_app_t {
struct _cef_command_line_t* command_line); struct _cef_command_line_t* command_line);
/// ///
// Provides an opportunity to register custom schemes. Do not keep a reference /// Provides an opportunity to register custom schemes. Do not keep a
// to the |registrar| object. This function is called on the main thread for /// reference to the |registrar| object. This function is called on the main
// each process and the registered schemes should be the same across all /// thread for each process and the registered schemes should be the same
// processes. /// across all processes.
/// ///
void(CEF_CALLBACK* on_register_custom_schemes)( void(CEF_CALLBACK* on_register_custom_schemes)(
struct _cef_app_t* self, struct _cef_app_t* self,
struct _cef_scheme_registrar_t* registrar); struct _cef_scheme_registrar_t* registrar);
/// ///
// Return the handler for resource bundle events. If /// Return the handler for resource bundle events. If
// CefSettings.pack_loading_disabled is true (1) a handler must be returned. /// cef_settings_t.pack_loading_disabled is true (1) a handler must be
// If no handler is returned resources will be loaded from pack files. This /// returned. If no handler is returned resources will be loaded from pack
// function is called by the browser and render processes on multiple threads. /// files. This function is called by the browser and render processes on
/// multiple threads.
/// ///
struct _cef_resource_bundle_handler_t*( struct _cef_resource_bundle_handler_t*(
CEF_CALLBACK* get_resource_bundle_handler)(struct _cef_app_t* self); CEF_CALLBACK* get_resource_bundle_handler)(struct _cef_app_t* self);
/// ///
// Return the handler for functionality specific to the browser process. This /// Return the handler for functionality specific to the browser process. This
// function is called on multiple threads in the browser process. /// function is called on multiple threads in the browser process.
/// ///
struct _cef_browser_process_handler_t*( struct _cef_browser_process_handler_t*(
CEF_CALLBACK* get_browser_process_handler)(struct _cef_app_t* self); CEF_CALLBACK* get_browser_process_handler)(struct _cef_app_t* self);
/// ///
// Return the handler for functionality specific to the render process. This /// Return the handler for functionality specific to the render process. This
// function is called on the render process main thread. /// function is called on the render process main thread.
/// ///
struct _cef_render_process_handler_t*( struct _cef_render_process_handler_t*(
CEF_CALLBACK* get_render_process_handler)(struct _cef_app_t* self); CEF_CALLBACK* get_render_process_handler)(struct _cef_app_t* self);
} cef_app_t; } cef_app_t;
/// ///
// This function should be called from the application entry point function to /// This function should be called from the application entry point function to
// execute a secondary process. It can be used to run secondary processes from /// execute a secondary process. It can be used to run secondary processes from
// the browser client executable (default behavior) or from a separate /// the browser client executable (default behavior) or from a separate
// executable specified by the CefSettings.browser_subprocess_path value. If /// executable specified by the cef_settings_t.browser_subprocess_path value. If
// called for the browser process (identified by no "type" command-line value) /// called for the browser process (identified by no "type" command-line value)
// it will return immediately with a value of -1. If called for a recognized /// it will return immediately with a value of -1. If called for a recognized
// secondary process it will block until the process should exit and then return /// secondary process it will block until the process should exit and then
// the process exit code. The |application| parameter may be NULL. The /// return the process exit code. The |application| parameter may be NULL. The
// |windows_sandbox_info| parameter is only used on Windows and may be NULL (see /// |windows_sandbox_info| parameter is only used on Windows and may be NULL
// cef_sandbox_win.h for details). /// (see cef_sandbox_win.h for details).
/// ///
CEF_EXPORT int cef_execute_process(const cef_main_args_t* args, CEF_EXPORT int cef_execute_process(const cef_main_args_t* args,
cef_app_t* application, cef_app_t* application,
void* windows_sandbox_info); void* windows_sandbox_info);
/// ///
// This function should be called on the main application thread to initialize /// This function should be called on the main application thread to initialize
// the CEF browser process. The |application| parameter may be NULL. A return /// the CEF browser process. The |application| parameter may be NULL. A return
// value of true (1) indicates that it succeeded and false (0) indicates that it /// value of true (1) indicates that it succeeded and false (0) indicates that
// failed. The |windows_sandbox_info| parameter is only used on Windows and may /// it failed. The |windows_sandbox_info| parameter is only used on Windows and
// be NULL (see cef_sandbox_win.h for details). /// may be NULL (see cef_sandbox_win.h for details).
/// ///
CEF_EXPORT int cef_initialize(const cef_main_args_t* args, CEF_EXPORT int cef_initialize(const cef_main_args_t* args,
const struct _cef_settings_t* settings, const struct _cef_settings_t* settings,
@ -142,55 +144,55 @@ CEF_EXPORT int cef_initialize(const cef_main_args_t* args,
void* windows_sandbox_info); void* windows_sandbox_info);
/// ///
// This function should be called on the main application thread to shut down /// This function should be called on the main application thread to shut down
// the CEF browser process before the application exits. /// the CEF browser process before the application exits.
/// ///
CEF_EXPORT void cef_shutdown(void); CEF_EXPORT void cef_shutdown(void);
/// ///
// Perform a single iteration of CEF message loop processing. This function is /// Perform a single iteration of CEF message loop processing. This function is
// provided for cases where the CEF message loop must be integrated into an /// provided for cases where the CEF message loop must be integrated into an
// existing application message loop. Use of this function is not recommended /// existing application message loop. Use of this function is not recommended
// for most users; use either the cef_run_message_loop() function or /// for most users; use either the cef_run_message_loop() function or
// CefSettings.multi_threaded_message_loop if possible. When using this function /// cef_settings_t.multi_threaded_message_loop if possible. When using this
// care must be taken to balance performance against excessive CPU usage. It is /// function care must be taken to balance performance against excessive CPU
// recommended to enable the CefSettings.external_message_pump option when using /// usage. It is recommended to enable the cef_settings_t.external_message_pump
// this function so that /// option when using this function so that
// cef_browser_process_handler_t::on_schedule_message_pump_work() callbacks can /// cef_browser_process_handler_t::on_schedule_message_pump_work() callbacks can
// facilitate the scheduling process. This function should only be called on the /// facilitate the scheduling process. This function should only be called on
// main application thread and only if cef_initialize() is called with a /// the main application thread and only if cef_initialize() is called with a
// CefSettings.multi_threaded_message_loop value of false (0). This function /// cef_settings_t.multi_threaded_message_loop value of false (0). This function
// will not block. /// will not block.
/// ///
CEF_EXPORT void cef_do_message_loop_work(void); CEF_EXPORT void cef_do_message_loop_work(void);
/// ///
// Run the CEF message loop. Use this function instead of an application- /// Run the CEF message loop. Use this function instead of an application-
// provided message loop to get the best balance between performance and CPU /// provided message loop to get the best balance between performance and CPU
// usage. This function should only be called on the main application thread and /// usage. This function should only be called on the main application thread
// only if cef_initialize() is called with a /// and only if cef_initialize() is called with a
// CefSettings.multi_threaded_message_loop value of false (0). This function /// cef_settings_t.multi_threaded_message_loop value of false (0). This function
// will block until a quit message is received by the system. /// will block until a quit message is received by the system.
/// ///
CEF_EXPORT void cef_run_message_loop(void); CEF_EXPORT void cef_run_message_loop(void);
/// ///
// Quit the CEF message loop that was started by calling cef_run_message_loop(). /// Quit the CEF message loop that was started by calling
// This function should only be called on the main application thread and only /// cef_run_message_loop(). This function should only be called on the main
// if cef_run_message_loop() was used. /// application thread and only if cef_run_message_loop() was used.
/// ///
CEF_EXPORT void cef_quit_message_loop(void); CEF_EXPORT void cef_quit_message_loop(void);
/// ///
// Set to true (1) before calling Windows APIs like TrackPopupMenu that enter a /// Set to true (1) before calling Windows APIs like TrackPopupMenu that enter a
// modal message loop. Set to false (0) after exiting the modal message loop. /// modal message loop. Set to false (0) after exiting the modal message loop.
/// ///
CEF_EXPORT void cef_set_osmodal_loop(int osModalLoop); CEF_EXPORT void cef_set_osmodal_loop(int osModalLoop);
/// ///
// Call during process startup to enable High-DPI support on Windows 7 or newer. /// Call during process startup to enable High-DPI support on Windows 7 or
// Older versions of Windows should be left DPI-unaware because they do not /// newer. Older versions of Windows should be left DPI-unaware because they do
// support DirectWrite and GDI fonts are kerned very badly. /// not support DirectWrite and GDI fonts are kerned very badly.
/// ///
CEF_EXPORT void cef_enable_highdpi_support(void); CEF_EXPORT void cef_enable_highdpi_support(void);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=62f58ab826b8a3d436655bf0855848632f2a73b5$ // $hash=4e243df31e29bc6e473d56e371ed6328d948959c$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_AUDIO_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_AUDIO_HANDLER_CAPI_H_
@ -48,30 +48,30 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to handle audio events. /// Implement this structure to handle audio events.
/// ///
typedef struct _cef_audio_handler_t { typedef struct _cef_audio_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called on the UI thread to allow configuration of audio stream parameters. /// Called on the UI thread to allow configuration of audio stream parameters.
// Return true (1) to proceed with audio stream capture, or false (0) to /// Return true (1) to proceed with audio stream capture, or false (0) to
// cancel it. All members of |params| can optionally be configured here, but /// cancel it. All members of |params| can optionally be configured here, but
// they are also pre-filled with some sensible defaults. /// they are also pre-filled with some sensible defaults.
/// ///
int(CEF_CALLBACK* get_audio_parameters)(struct _cef_audio_handler_t* self, int(CEF_CALLBACK* get_audio_parameters)(struct _cef_audio_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
cef_audio_parameters_t* params); cef_audio_parameters_t* params);
/// ///
// Called on a browser audio capture thread when the browser starts streaming /// Called on a browser audio capture thread when the browser starts streaming
// audio. OnAudioStreamStopped will always be called after /// audio. OnAudioStreamStopped will always be called after
// OnAudioStreamStarted; both functions may be called multiple times for the /// OnAudioStreamStarted; both functions may be called multiple times for the
// same browser. |params| contains the audio parameters like sample rate and /// same browser. |params| contains the audio parameters like sample rate and
// channel layout. |channels| is the number of channels. /// channel layout. |channels| is the number of channels.
/// ///
void(CEF_CALLBACK* on_audio_stream_started)( void(CEF_CALLBACK* on_audio_stream_started)(
struct _cef_audio_handler_t* self, struct _cef_audio_handler_t* self,
@ -80,14 +80,14 @@ typedef struct _cef_audio_handler_t {
int channels); int channels);
/// ///
// Called on the audio stream thread when a PCM packet is received for the /// Called on the audio stream thread when a PCM packet is received for the
// stream. |data| is an array representing the raw PCM data as a floating /// stream. |data| is an array representing the raw PCM data as a floating
// point type, i.e. 4-byte value(s). |frames| is the number of frames in the /// point type, i.e. 4-byte value(s). |frames| is the number of frames in the
// PCM packet. |pts| is the presentation timestamp (in milliseconds since the /// PCM packet. |pts| is the presentation timestamp (in milliseconds since the
// Unix Epoch) and represents the time at which the decompressed packet should /// Unix Epoch) and represents the time at which the decompressed packet
// be presented to the user. Based on |frames| and the |channel_layout| value /// should be presented to the user. Based on |frames| and the
// passed to OnAudioStreamStarted you can calculate the size of the |data| /// |channel_layout| value passed to OnAudioStreamStarted you can calculate
// array in bytes. /// the size of the |data| array in bytes.
/// ///
void(CEF_CALLBACK* on_audio_stream_packet)(struct _cef_audio_handler_t* self, void(CEF_CALLBACK* on_audio_stream_packet)(struct _cef_audio_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -96,18 +96,18 @@ typedef struct _cef_audio_handler_t {
int64 pts); int64 pts);
/// ///
// Called on the UI thread when the stream has stopped. OnAudioSteamStopped /// Called on the UI thread when the stream has stopped. OnAudioSteamStopped
// will always be called after OnAudioStreamStarted; both functions may be /// will always be called after OnAudioStreamStarted; both functions may be
// called multiple times for the same stream. /// called multiple times for the same stream.
/// ///
void(CEF_CALLBACK* on_audio_stream_stopped)(struct _cef_audio_handler_t* self, void(CEF_CALLBACK* on_audio_stream_stopped)(struct _cef_audio_handler_t* self,
struct _cef_browser_t* browser); struct _cef_browser_t* browser);
/// ///
// Called on the UI or audio stream thread when an error occurred. During the /// Called on the UI or audio stream thread when an error occurred. During the
// stream creation phase this callback will be called on the UI thread while /// stream creation phase this callback will be called on the UI thread while
// in the capturing phase it will be called on the audio stream thread. The /// in the capturing phase it will be called on the audio stream thread. The
// stream will be stopped immediately. /// stream will be stopped immediately.
/// ///
void(CEF_CALLBACK* on_audio_stream_error)(struct _cef_audio_handler_t* self, void(CEF_CALLBACK* on_audio_stream_error)(struct _cef_audio_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=01a33de48ac9780f78d606d8aee2429ddb0c81a2$ // $hash=c0704c0a87e8b57b20887be75700a30e887fee4f$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_AUTH_CALLBACK_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_AUTH_CALLBACK_CAPI_H_
@ -47,24 +47,24 @@ extern "C" {
#endif #endif
/// ///
// Callback structure used for asynchronous continuation of authentication /// Callback structure used for asynchronous continuation of authentication
// requests. /// requests.
/// ///
typedef struct _cef_auth_callback_t { typedef struct _cef_auth_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Continue the authentication request. /// Continue the authentication request.
/// ///
void(CEF_CALLBACK* cont)(struct _cef_auth_callback_t* self, void(CEF_CALLBACK* cont)(struct _cef_auth_callback_t* self,
const cef_string_t* username, const cef_string_t* username,
const cef_string_t* password); const cef_string_t* password);
/// ///
// Cancel the authentication request. /// Cancel the authentication request.
/// ///
void(CEF_CALLBACK* cancel)(struct _cef_auth_callback_t* self); void(CEF_CALLBACK* cancel)(struct _cef_auth_callback_t* self);
} cef_auth_callback_t; } cef_auth_callback_t;

File diff suppressed because it is too large Load Diff

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=ad0a78715daff99c1ec987800b7e5d62196e7100$ // $hash=c4ed4278e513daa2a1ccf42e50e242d61dfbb86f$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_PROCESS_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_PROCESS_HANDLER_CAPI_H_
@ -50,57 +50,57 @@ extern "C" {
#endif #endif
/// ///
// Structure used to implement browser process callbacks. The functions of this /// Structure used to implement browser process callbacks. The functions of this
// structure will be called on the browser process main thread unless otherwise /// structure will be called on the browser process main thread unless otherwise
// indicated. /// indicated.
/// ///
typedef struct _cef_browser_process_handler_t { typedef struct _cef_browser_process_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called on the browser process UI thread immediately after the CEF context /// Called on the browser process UI thread immediately after the CEF context
// has been initialized. /// has been initialized.
/// ///
void(CEF_CALLBACK* on_context_initialized)( void(CEF_CALLBACK* on_context_initialized)(
struct _cef_browser_process_handler_t* self); struct _cef_browser_process_handler_t* self);
/// ///
// Called before a child process is launched. Will be called on the browser /// Called before a child process is launched. Will be called on the browser
// process UI thread when launching a render process and on the browser /// process UI thread when launching a render process and on the browser
// process IO thread when launching a GPU process. Provides an opportunity to /// process IO thread when launching a GPU process. Provides an opportunity to
// modify the child process command line. Do not keep a reference to /// modify the child process command line. Do not keep a reference to
// |command_line| outside of this function. /// |command_line| outside of this function.
/// ///
void(CEF_CALLBACK* on_before_child_process_launch)( void(CEF_CALLBACK* on_before_child_process_launch)(
struct _cef_browser_process_handler_t* self, struct _cef_browser_process_handler_t* self,
struct _cef_command_line_t* command_line); struct _cef_command_line_t* command_line);
/// ///
// Called from any thread when work has been scheduled for the browser process /// Called from any thread when work has been scheduled for the browser
// main (UI) thread. This callback is used in combination with CefSettings. /// process main (UI) thread. This callback is used in combination with
// external_message_pump and cef_do_message_loop_work() in cases where the CEF /// cef_settings_t.external_message_pump and cef_do_message_loop_work() in
// message loop must be integrated into an existing application message loop /// cases where the CEF message loop must be integrated into an existing
// (see additional comments and warnings on CefDoMessageLoopWork). This /// application message loop (see additional comments and warnings on
// callback should schedule a cef_do_message_loop_work() call to happen on the /// CefDoMessageLoopWork). This callback should schedule a
// main (UI) thread. |delay_ms| is the requested delay in milliseconds. If /// cef_do_message_loop_work() call to happen on the main (UI) thread.
// |delay_ms| is <= 0 then the call should happen reasonably soon. If /// |delay_ms| is the requested delay in milliseconds. If |delay_ms| is <= 0
// |delay_ms| is > 0 then the call should be scheduled to happen after the /// then the call should happen reasonably soon. If |delay_ms| is > 0 then the
// specified delay and any currently pending scheduled call should be /// call should be scheduled to happen after the specified delay and any
// cancelled. /// currently pending scheduled call should be cancelled.
/// ///
void(CEF_CALLBACK* on_schedule_message_pump_work)( void(CEF_CALLBACK* on_schedule_message_pump_work)(
struct _cef_browser_process_handler_t* self, struct _cef_browser_process_handler_t* self,
int64 delay_ms); int64 delay_ms);
/// ///
// Return the default client for use with a newly created browser window. If /// Return the default client for use with a newly created browser window. If
// null is returned the browser will be unmanaged (no callbacks will be /// null is returned the browser will be unmanaged (no callbacks will be
// executed for that browser) and application shutdown will be blocked until /// executed for that browser) and application shutdown will be blocked until
// the browser window is closed manually. This function is currently only used /// the browser window is closed manually. This function is currently only
// with the chrome runtime. /// used with the chrome runtime.
/// ///
struct _cef_client_t*(CEF_CALLBACK* get_default_client)( struct _cef_client_t*(CEF_CALLBACK* get_default_client)(
struct _cef_browser_process_handler_t* self); struct _cef_browser_process_handler_t* self);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=10ef5088ce2a5c6ffb38f8864d3aad6e5ac88b40$ // $hash=1bb026d01d1d4bb38ceb4c54f6bcf70300bf5201$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_CALLBACK_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_CALLBACK_CAPI_H_
@ -47,36 +47,36 @@ extern "C" {
#endif #endif
/// ///
// Generic callback structure used for asynchronous continuation. /// Generic callback structure used for asynchronous continuation.
/// ///
typedef struct _cef_callback_t { typedef struct _cef_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Continue processing. /// Continue processing.
/// ///
void(CEF_CALLBACK* cont)(struct _cef_callback_t* self); void(CEF_CALLBACK* cont)(struct _cef_callback_t* self);
/// ///
// Cancel processing. /// Cancel processing.
/// ///
void(CEF_CALLBACK* cancel)(struct _cef_callback_t* self); void(CEF_CALLBACK* cancel)(struct _cef_callback_t* self);
} cef_callback_t; } cef_callback_t;
/// ///
// Generic callback structure used for asynchronous completion. /// Generic callback structure used for asynchronous completion.
/// ///
typedef struct _cef_completion_callback_t { typedef struct _cef_completion_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Method that will be called once the task is complete. /// Method that will be called once the task is complete.
/// ///
void(CEF_CALLBACK* on_complete)(struct _cef_completion_callback_t* self); void(CEF_CALLBACK* on_complete)(struct _cef_completion_callback_t* self);
} cef_completion_callback_t; } cef_completion_callback_t;

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=03ae4ba9762510e2b0c19ea29322c20ebaf2e683$ // $hash=93f1c39c102dc97d6ad8d236a90a2e0e88f10fb7$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_CLIENT_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_CLIENT_CAPI_H_
@ -66,134 +66,134 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to provide handler implementations. /// Implement this structure to provide handler implementations.
/// ///
typedef struct _cef_client_t { typedef struct _cef_client_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Return the handler for audio rendering events. /// Return the handler for audio rendering events.
/// ///
struct _cef_audio_handler_t*(CEF_CALLBACK* get_audio_handler)( struct _cef_audio_handler_t*(CEF_CALLBACK* get_audio_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for commands. If no handler is provided the default /// Return the handler for commands. If no handler is provided the default
// implementation will be used. /// implementation will be used.
/// ///
struct _cef_command_handler_t*(CEF_CALLBACK* get_command_handler)( struct _cef_command_handler_t*(CEF_CALLBACK* get_command_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for context menus. If no handler is provided the default /// Return the handler for context menus. If no handler is provided the
// implementation will be used. /// default implementation will be used.
/// ///
struct _cef_context_menu_handler_t*(CEF_CALLBACK* get_context_menu_handler)( struct _cef_context_menu_handler_t*(CEF_CALLBACK* get_context_menu_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for dialogs. If no handler is provided the default /// Return the handler for dialogs. If no handler is provided the default
// implementation will be used. /// implementation will be used.
/// ///
struct _cef_dialog_handler_t*(CEF_CALLBACK* get_dialog_handler)( struct _cef_dialog_handler_t*(CEF_CALLBACK* get_dialog_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for browser display state events. /// Return the handler for browser display state events.
/// ///
struct _cef_display_handler_t*(CEF_CALLBACK* get_display_handler)( struct _cef_display_handler_t*(CEF_CALLBACK* get_display_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for download events. If no handler is returned downloads /// Return the handler for download events. If no handler is returned
// will not be allowed. /// downloads will not be allowed.
/// ///
struct _cef_download_handler_t*(CEF_CALLBACK* get_download_handler)( struct _cef_download_handler_t*(CEF_CALLBACK* get_download_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for drag events. /// Return the handler for drag events.
/// ///
struct _cef_drag_handler_t*(CEF_CALLBACK* get_drag_handler)( struct _cef_drag_handler_t*(CEF_CALLBACK* get_drag_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for find result events. /// Return the handler for find result events.
/// ///
struct _cef_find_handler_t*(CEF_CALLBACK* get_find_handler)( struct _cef_find_handler_t*(CEF_CALLBACK* get_find_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for focus events. /// Return the handler for focus events.
/// ///
struct _cef_focus_handler_t*(CEF_CALLBACK* get_focus_handler)( struct _cef_focus_handler_t*(CEF_CALLBACK* get_focus_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for events related to cef_frame_t lifespan. This /// Return the handler for events related to cef_frame_t lifespan. This
// function will be called once during cef_browser_t creation and the result /// function will be called once during cef_browser_t creation and the result
// will be cached for performance reasons. /// will be cached for performance reasons.
/// ///
struct _cef_frame_handler_t*(CEF_CALLBACK* get_frame_handler)( struct _cef_frame_handler_t*(CEF_CALLBACK* get_frame_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for permission requests. /// Return the handler for permission requests.
/// ///
struct _cef_permission_handler_t*(CEF_CALLBACK* get_permission_handler)( struct _cef_permission_handler_t*(CEF_CALLBACK* get_permission_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for JavaScript dialogs. If no handler is provided the /// Return the handler for JavaScript dialogs. If no handler is provided the
// default implementation will be used. /// default implementation will be used.
/// ///
struct _cef_jsdialog_handler_t*(CEF_CALLBACK* get_jsdialog_handler)( struct _cef_jsdialog_handler_t*(CEF_CALLBACK* get_jsdialog_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for keyboard events. /// Return the handler for keyboard events.
/// ///
struct _cef_keyboard_handler_t*(CEF_CALLBACK* get_keyboard_handler)( struct _cef_keyboard_handler_t*(CEF_CALLBACK* get_keyboard_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for browser life span events. /// Return the handler for browser life span events.
/// ///
struct _cef_life_span_handler_t*(CEF_CALLBACK* get_life_span_handler)( struct _cef_life_span_handler_t*(CEF_CALLBACK* get_life_span_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for browser load status events. /// Return the handler for browser load status events.
/// ///
struct _cef_load_handler_t*(CEF_CALLBACK* get_load_handler)( struct _cef_load_handler_t*(CEF_CALLBACK* get_load_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for printing on Linux. If a print handler is not /// Return the handler for printing on Linux. If a print handler is not
// provided then printing will not be supported on the Linux platform. /// provided then printing will not be supported on the Linux platform.
/// ///
struct _cef_print_handler_t*(CEF_CALLBACK* get_print_handler)( struct _cef_print_handler_t*(CEF_CALLBACK* get_print_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for off-screen rendering events. /// Return the handler for off-screen rendering events.
/// ///
struct _cef_render_handler_t*(CEF_CALLBACK* get_render_handler)( struct _cef_render_handler_t*(CEF_CALLBACK* get_render_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Return the handler for browser request events. /// Return the handler for browser request events.
/// ///
struct _cef_request_handler_t*(CEF_CALLBACK* get_request_handler)( struct _cef_request_handler_t*(CEF_CALLBACK* get_request_handler)(
struct _cef_client_t* self); struct _cef_client_t* self);
/// ///
// Called when a new message is received from a different process. Return true /// Called when a new message is received from a different process. Return
// (1) if the message was handled or false (0) otherwise. It is safe to keep /// true (1) if the message was handled or false (0) otherwise. It is safe to
// a reference to |message| outside of this callback. /// keep a reference to |message| outside of this callback.
/// ///
int(CEF_CALLBACK* on_process_message_received)( int(CEF_CALLBACK* on_process_message_received)(
struct _cef_client_t* self, struct _cef_client_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=54332b79c057df9c8f3be56cc77f1daf877b3ac1$ // $hash=ec05ae57537091e3543c4b31d72d2d84d44df876$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_COMMAND_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_COMMAND_HANDLER_CAPI_H_
@ -48,23 +48,23 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to handle events related to commands. The functions /// Implement this structure to handle events related to commands. The functions
// of this structure will be called on the UI thread. /// of this structure will be called on the UI thread.
/// ///
typedef struct _cef_command_handler_t { typedef struct _cef_command_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called to execute a Chrome command triggered via menu selection or keyboard /// Called to execute a Chrome command triggered via menu selection or
// shortcut. Values for |command_id| can be found in the cef_command_ids.h /// keyboard shortcut. Values for |command_id| can be found in the
// file. |disposition| provides information about the intended command target. /// cef_command_ids.h file. |disposition| provides information about the
// Return true (1) if the command was handled or false (0) for the default /// intended command target. Return true (1) if the command was handled or
// implementation. For context menu commands this will be called after /// false (0) for the default implementation. For context menu commands this
// cef_context_menu_handler_t::OnContextMenuCommand. Only used with the Chrome /// will be called after cef_context_menu_handler_t::OnContextMenuCommand.
// runtime. /// Only used with the Chrome runtime.
/// ///
int(CEF_CALLBACK* on_chrome_command)( int(CEF_CALLBACK* on_chrome_command)(
struct _cef_command_handler_t* self, struct _cef_command_handler_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=3049c9960a95d32d61cc57ae998c0eba12820673$ // $hash=f535e9560b9fde9b53fc4d8383905105ed029ea4$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_COMMAND_LINE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_COMMAND_LINE_CAPI_H_
@ -47,104 +47,104 @@ extern "C" {
#endif #endif
/// ///
// Structure used to create and/or parse command line arguments. Arguments with /// Structure used to create and/or parse command line arguments. Arguments with
// '--', '-' and, on Windows, '/' prefixes are considered switches. Switches /// "--", "-" and, on Windows, "/" prefixes are considered switches. Switches
// will always precede any arguments without switch prefixes. Switches can /// will always precede any arguments without switch prefixes. Switches can
// optionally have a value specified using the '=' delimiter (e.g. /// optionally have a value specified using the "=" delimiter (e.g.
// "-switch=value"). An argument of "--" will terminate switch parsing with all /// "-switch=value"). An argument of "--" will terminate switch parsing with all
// subsequent tokens, regardless of prefix, being interpreted as non-switch /// subsequent tokens, regardless of prefix, being interpreted as non-switch
// arguments. Switch names should be lowercase ASCII and will be converted to /// arguments. Switch names should be lowercase ASCII and will be converted to
// such if necessary. Switch values will retain the original case and UTF8 /// such if necessary. Switch values will retain the original case and UTF8
// encoding. This structure can be used before cef_initialize() is called. /// encoding. This structure can be used before cef_initialize() is called.
/// ///
typedef struct _cef_command_line_t { typedef struct _cef_command_line_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is valid. Do not call any other functions /// Returns true (1) if this object is valid. Do not call any other functions
// if this function returns false (0). /// if this function returns false (0).
/// ///
int(CEF_CALLBACK* is_valid)(struct _cef_command_line_t* self); int(CEF_CALLBACK* is_valid)(struct _cef_command_line_t* self);
/// ///
// Returns true (1) if the values of this object are read-only. Some APIs may /// Returns true (1) if the values of this object are read-only. Some APIs may
// expose read-only objects. /// expose read-only objects.
/// ///
int(CEF_CALLBACK* is_read_only)(struct _cef_command_line_t* self); int(CEF_CALLBACK* is_read_only)(struct _cef_command_line_t* self);
/// ///
// Returns a writable copy of this object. /// Returns a writable copy of this object.
/// ///
struct _cef_command_line_t*(CEF_CALLBACK* copy)( struct _cef_command_line_t*(CEF_CALLBACK* copy)(
struct _cef_command_line_t* self); struct _cef_command_line_t* self);
/// ///
// Initialize the command line with the specified |argc| and |argv| values. /// Initialize the command line with the specified |argc| and |argv| values.
// The first argument must be the name of the program. This function is only /// The first argument must be the name of the program. This function is only
// supported on non-Windows platforms. /// supported on non-Windows platforms.
/// ///
void(CEF_CALLBACK* init_from_argv)(struct _cef_command_line_t* self, void(CEF_CALLBACK* init_from_argv)(struct _cef_command_line_t* self,
int argc, int argc,
const char* const* argv); const char* const* argv);
/// ///
// Initialize the command line with the string returned by calling /// Initialize the command line with the string returned by calling
// GetCommandLineW(). This function is only supported on Windows. /// GetCommandLineW(). This function is only supported on Windows.
/// ///
void(CEF_CALLBACK* init_from_string)(struct _cef_command_line_t* self, void(CEF_CALLBACK* init_from_string)(struct _cef_command_line_t* self,
const cef_string_t* command_line); const cef_string_t* command_line);
/// ///
// Reset the command-line switches and arguments but leave the program /// Reset the command-line switches and arguments but leave the program
// component unchanged. /// component unchanged.
/// ///
void(CEF_CALLBACK* reset)(struct _cef_command_line_t* self); void(CEF_CALLBACK* reset)(struct _cef_command_line_t* self);
/// ///
// Retrieve the original command line string as a vector of strings. The argv /// Retrieve the original command line string as a vector of strings. The argv
// array: { program, [(--|-|/)switch[=value]]*, [--], [argument]* } /// array: `{ program, [(--|-|/)switch[=value]]*, [--], [argument]* }`
/// ///
void(CEF_CALLBACK* get_argv)(struct _cef_command_line_t* self, void(CEF_CALLBACK* get_argv)(struct _cef_command_line_t* self,
cef_string_list_t argv); cef_string_list_t argv);
/// ///
// Constructs and returns the represented command line string. Use this /// Constructs and returns the represented command line string. Use this
// function cautiously because quoting behavior is unclear. /// function cautiously because quoting behavior is unclear.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_command_line_string)( cef_string_userfree_t(CEF_CALLBACK* get_command_line_string)(
struct _cef_command_line_t* self); struct _cef_command_line_t* self);
/// ///
// Get the program part of the command line string (the first item). /// Get the program part of the command line string (the first item).
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_program)( cef_string_userfree_t(CEF_CALLBACK* get_program)(
struct _cef_command_line_t* self); struct _cef_command_line_t* self);
/// ///
// Set the program part of the command line string (the first item). /// Set the program part of the command line string (the first item).
/// ///
void(CEF_CALLBACK* set_program)(struct _cef_command_line_t* self, void(CEF_CALLBACK* set_program)(struct _cef_command_line_t* self,
const cef_string_t* program); const cef_string_t* program);
/// ///
// Returns true (1) if the command line has switches. /// Returns true (1) if the command line has switches.
/// ///
int(CEF_CALLBACK* has_switches)(struct _cef_command_line_t* self); int(CEF_CALLBACK* has_switches)(struct _cef_command_line_t* self);
/// ///
// Returns true (1) if the command line contains the given switch. /// Returns true (1) if the command line contains the given switch.
/// ///
int(CEF_CALLBACK* has_switch)(struct _cef_command_line_t* self, int(CEF_CALLBACK* has_switch)(struct _cef_command_line_t* self,
const cef_string_t* name); const cef_string_t* name);
/// ///
// Returns the value associated with the given switch. If the switch has no /// Returns the value associated with the given switch. If the switch has no
// value or isn't present this function returns the NULL string. /// value or isn't present this function returns the NULL string.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_switch_value)( cef_string_userfree_t(CEF_CALLBACK* get_switch_value)(
@ -152,59 +152,59 @@ typedef struct _cef_command_line_t {
const cef_string_t* name); const cef_string_t* name);
/// ///
// Returns the map of switch names and values. If a switch has no value an /// Returns the map of switch names and values. If a switch has no value an
// NULL string is returned. /// NULL string is returned.
/// ///
void(CEF_CALLBACK* get_switches)(struct _cef_command_line_t* self, void(CEF_CALLBACK* get_switches)(struct _cef_command_line_t* self,
cef_string_map_t switches); cef_string_map_t switches);
/// ///
// Add a switch to the end of the command line. If the switch has no value /// Add a switch to the end of the command line. If the switch has no value
// pass an NULL value string. /// pass an NULL value string.
/// ///
void(CEF_CALLBACK* append_switch)(struct _cef_command_line_t* self, void(CEF_CALLBACK* append_switch)(struct _cef_command_line_t* self,
const cef_string_t* name); const cef_string_t* name);
/// ///
// Add a switch with the specified value to the end of the command line. /// Add a switch with the specified value to the end of the command line.
/// ///
void(CEF_CALLBACK* append_switch_with_value)(struct _cef_command_line_t* self, void(CEF_CALLBACK* append_switch_with_value)(struct _cef_command_line_t* self,
const cef_string_t* name, const cef_string_t* name,
const cef_string_t* value); const cef_string_t* value);
/// ///
// True if there are remaining command line arguments. /// True if there are remaining command line arguments.
/// ///
int(CEF_CALLBACK* has_arguments)(struct _cef_command_line_t* self); int(CEF_CALLBACK* has_arguments)(struct _cef_command_line_t* self);
/// ///
// Get the remaining command line arguments. /// Get the remaining command line arguments.
/// ///
void(CEF_CALLBACK* get_arguments)(struct _cef_command_line_t* self, void(CEF_CALLBACK* get_arguments)(struct _cef_command_line_t* self,
cef_string_list_t arguments); cef_string_list_t arguments);
/// ///
// Add an argument to the end of the command line. /// Add an argument to the end of the command line.
/// ///
void(CEF_CALLBACK* append_argument)(struct _cef_command_line_t* self, void(CEF_CALLBACK* append_argument)(struct _cef_command_line_t* self,
const cef_string_t* argument); const cef_string_t* argument);
/// ///
// Insert a command before the current command. Common for debuggers, like /// Insert a command before the current command. Common for debuggers, like
// "valgrind" or "gdb --args". /// "valgrind" or "gdb --args".
/// ///
void(CEF_CALLBACK* prepend_wrapper)(struct _cef_command_line_t* self, void(CEF_CALLBACK* prepend_wrapper)(struct _cef_command_line_t* self,
const cef_string_t* wrapper); const cef_string_t* wrapper);
} cef_command_line_t; } cef_command_line_t;
/// ///
// Create a new cef_command_line_t instance. /// Create a new cef_command_line_t instance.
/// ///
CEF_EXPORT cef_command_line_t* cef_command_line_create(void); CEF_EXPORT cef_command_line_t* cef_command_line_create(void);
/// ///
// Returns the singleton global cef_command_line_t object. The returned object /// Returns the singleton global cef_command_line_t object. The returned object
// will be read-only. /// will be read-only.
/// ///
CEF_EXPORT cef_command_line_t* cef_command_line_get_global(void); CEF_EXPORT cef_command_line_t* cef_command_line_get_global(void);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=d9498ae2e32ec124df3dd2c3017bcf415d4205f8$ // $hash=0ae549ed35e30afcbb01961fe55455beaadcd7f9$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_CONTEXT_MENU_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_CONTEXT_MENU_HANDLER_CAPI_H_
@ -52,67 +52,67 @@ extern "C" {
struct _cef_context_menu_params_t; struct _cef_context_menu_params_t;
/// ///
// Callback structure used for continuation of custom context menu display. /// Callback structure used for continuation of custom context menu display.
/// ///
typedef struct _cef_run_context_menu_callback_t { typedef struct _cef_run_context_menu_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Complete context menu display by selecting the specified |command_id| and /// Complete context menu display by selecting the specified |command_id| and
// |event_flags|. /// |event_flags|.
/// ///
void(CEF_CALLBACK* cont)(struct _cef_run_context_menu_callback_t* self, void(CEF_CALLBACK* cont)(struct _cef_run_context_menu_callback_t* self,
int command_id, int command_id,
cef_event_flags_t event_flags); cef_event_flags_t event_flags);
/// ///
// Cancel context menu display. /// Cancel context menu display.
/// ///
void(CEF_CALLBACK* cancel)(struct _cef_run_context_menu_callback_t* self); void(CEF_CALLBACK* cancel)(struct _cef_run_context_menu_callback_t* self);
} cef_run_context_menu_callback_t; } cef_run_context_menu_callback_t;
/// ///
// Callback structure used for continuation of custom quick menu display. /// Callback structure used for continuation of custom quick menu display.
/// ///
typedef struct _cef_run_quick_menu_callback_t { typedef struct _cef_run_quick_menu_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Complete quick menu display by selecting the specified |command_id| and /// Complete quick menu display by selecting the specified |command_id| and
// |event_flags|. /// |event_flags|.
/// ///
void(CEF_CALLBACK* cont)(struct _cef_run_quick_menu_callback_t* self, void(CEF_CALLBACK* cont)(struct _cef_run_quick_menu_callback_t* self,
int command_id, int command_id,
cef_event_flags_t event_flags); cef_event_flags_t event_flags);
/// ///
// Cancel quick menu display. /// Cancel quick menu display.
/// ///
void(CEF_CALLBACK* cancel)(struct _cef_run_quick_menu_callback_t* self); void(CEF_CALLBACK* cancel)(struct _cef_run_quick_menu_callback_t* self);
} cef_run_quick_menu_callback_t; } cef_run_quick_menu_callback_t;
/// ///
// Implement this structure to handle context menu events. The functions of this /// Implement this structure to handle context menu events. The functions of
// structure will be called on the UI thread. /// this structure will be called on the UI thread.
/// ///
typedef struct _cef_context_menu_handler_t { typedef struct _cef_context_menu_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called before a context menu is displayed. |params| provides information /// Called before a context menu is displayed. |params| provides information
// about the context menu state. |model| initially contains the default /// about the context menu state. |model| initially contains the default
// context menu. The |model| can be cleared to show no context menu or /// context menu. The |model| can be cleared to show no context menu or
// modified to show a custom menu. Do not keep references to |params| or /// modified to show a custom menu. Do not keep references to |params| or
// |model| outside of this callback. /// |model| outside of this callback.
/// ///
void(CEF_CALLBACK* on_before_context_menu)( void(CEF_CALLBACK* on_before_context_menu)(
struct _cef_context_menu_handler_t* self, struct _cef_context_menu_handler_t* self,
@ -122,12 +122,12 @@ typedef struct _cef_context_menu_handler_t {
struct _cef_menu_model_t* model); struct _cef_menu_model_t* model);
/// ///
// Called to allow custom display of the context menu. |params| provides /// Called to allow custom display of the context menu. |params| provides
// information about the context menu state. |model| contains the context menu /// information about the context menu state. |model| contains the context
// model resulting from OnBeforeContextMenu. For custom display return true /// menu model resulting from OnBeforeContextMenu. For custom display return
// (1) and execute |callback| either synchronously or asynchronously with the /// true (1) and execute |callback| either synchronously or asynchronously
// selected command ID. For default display return false (0). Do not keep /// with the selected command ID. For default display return false (0). Do not
// references to |params| or |model| outside of this callback. /// keep references to |params| or |model| outside of this callback.
/// ///
int(CEF_CALLBACK* run_context_menu)( int(CEF_CALLBACK* run_context_menu)(
struct _cef_context_menu_handler_t* self, struct _cef_context_menu_handler_t* self,
@ -138,13 +138,13 @@ typedef struct _cef_context_menu_handler_t {
struct _cef_run_context_menu_callback_t* callback); struct _cef_run_context_menu_callback_t* callback);
/// ///
// Called to execute a command selected from the context menu. Return true (1) /// Called to execute a command selected from the context menu. Return true
// if the command was handled or false (0) for the default implementation. See /// (1) if the command was handled or false (0) for the default
// cef_menu_id_t for the command ids that have default implementations. All /// implementation. See cef_menu_id_t for the command ids that have default
// user-defined command ids should be between MENU_ID_USER_FIRST and /// implementations. All user-defined command ids should be between
// MENU_ID_USER_LAST. |params| will have the same values as what was passed to /// MENU_ID_USER_FIRST and MENU_ID_USER_LAST. |params| will have the same
// on_before_context_menu(). Do not keep a reference to |params| outside of /// values as what was passed to on_before_context_menu(). Do not keep a
// this callback. /// reference to |params| outside of this callback.
/// ///
int(CEF_CALLBACK* on_context_menu_command)( int(CEF_CALLBACK* on_context_menu_command)(
struct _cef_context_menu_handler_t* self, struct _cef_context_menu_handler_t* self,
@ -155,8 +155,8 @@ typedef struct _cef_context_menu_handler_t {
cef_event_flags_t event_flags); cef_event_flags_t event_flags);
/// ///
// Called when the context menu is dismissed irregardless of whether the menu /// Called when the context menu is dismissed irregardless of whether the menu
// was canceled or a command was selected. /// was canceled or a command was selected.
/// ///
void(CEF_CALLBACK* on_context_menu_dismissed)( void(CEF_CALLBACK* on_context_menu_dismissed)(
struct _cef_context_menu_handler_t* self, struct _cef_context_menu_handler_t* self,
@ -164,13 +164,13 @@ typedef struct _cef_context_menu_handler_t {
struct _cef_frame_t* frame); struct _cef_frame_t* frame);
/// ///
// Called to allow custom display of the quick menu for a windowless browser. /// Called to allow custom display of the quick menu for a windowless browser.
// |location| is the top left corner of the selected region. |size| is the /// |location| is the top left corner of the selected region. |size| is the
// size of the selected region. |edit_state_flags| is a combination of flags /// size of the selected region. |edit_state_flags| is a combination of flags
// that represent the state of the quick menu. Return true (1) if the menu /// that represent the state of the quick menu. Return true (1) if the menu
// will be handled and execute |callback| either synchronously or /// will be handled and execute |callback| either synchronously or
// asynchronously with the selected command ID. Return false (0) to cancel the /// asynchronously with the selected command ID. Return false (0) to cancel
// menu. /// the menu.
/// ///
int(CEF_CALLBACK* run_quick_menu)( int(CEF_CALLBACK* run_quick_menu)(
struct _cef_context_menu_handler_t* self, struct _cef_context_menu_handler_t* self,
@ -182,10 +182,10 @@ typedef struct _cef_context_menu_handler_t {
struct _cef_run_quick_menu_callback_t* callback); struct _cef_run_quick_menu_callback_t* callback);
/// ///
// Called to execute a command selected from the quick menu for a windowless /// Called to execute a command selected from the quick menu for a windowless
// browser. Return true (1) if the command was handled or false (0) for the /// browser. Return true (1) if the command was handled or false (0) for the
// default implementation. See cef_menu_id_t for command IDs that have default /// default implementation. See cef_menu_id_t for command IDs that have
// implementations. /// default implementations.
/// ///
int(CEF_CALLBACK* on_quick_menu_command)( int(CEF_CALLBACK* on_quick_menu_command)(
struct _cef_context_menu_handler_t* self, struct _cef_context_menu_handler_t* self,
@ -195,8 +195,8 @@ typedef struct _cef_context_menu_handler_t {
cef_event_flags_t event_flags); cef_event_flags_t event_flags);
/// ///
// Called when the quick menu for a windowless browser is dismissed /// Called when the quick menu for a windowless browser is dismissed
// irregardless of whether the menu was canceled or a command was selected. /// irregardless of whether the menu was canceled or a command was selected.
/// ///
void(CEF_CALLBACK* on_quick_menu_dismissed)( void(CEF_CALLBACK* on_quick_menu_dismissed)(
struct _cef_context_menu_handler_t* self, struct _cef_context_menu_handler_t* self,
@ -205,155 +205,157 @@ typedef struct _cef_context_menu_handler_t {
} cef_context_menu_handler_t; } cef_context_menu_handler_t;
/// ///
// Provides information about the context menu state. The functions of this /// Provides information about the context menu state. The functions of this
// structure can only be accessed on browser process the UI thread. /// structure can only be accessed on browser process the UI thread.
/// ///
typedef struct _cef_context_menu_params_t { typedef struct _cef_context_menu_params_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns the X coordinate of the mouse where the context menu was invoked. /// Returns the X coordinate of the mouse where the context menu was invoked.
// Coords are relative to the associated RenderView's origin. /// Coords are relative to the associated RenderView's origin.
/// ///
int(CEF_CALLBACK* get_xcoord)(struct _cef_context_menu_params_t* self); int(CEF_CALLBACK* get_xcoord)(struct _cef_context_menu_params_t* self);
/// ///
// Returns the Y coordinate of the mouse where the context menu was invoked. /// Returns the Y coordinate of the mouse where the context menu was invoked.
// Coords are relative to the associated RenderView's origin. /// Coords are relative to the associated RenderView's origin.
/// ///
int(CEF_CALLBACK* get_ycoord)(struct _cef_context_menu_params_t* self); int(CEF_CALLBACK* get_ycoord)(struct _cef_context_menu_params_t* self);
/// ///
// Returns flags representing the type of node that the context menu was /// Returns flags representing the type of node that the context menu was
// invoked on. /// invoked on.
/// ///
cef_context_menu_type_flags_t(CEF_CALLBACK* get_type_flags)( cef_context_menu_type_flags_t(CEF_CALLBACK* get_type_flags)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns the URL of the link, if any, that encloses the node that the /// Returns the URL of the link, if any, that encloses the node that the
// context menu was invoked on. /// context menu was invoked on.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_link_url)( cef_string_userfree_t(CEF_CALLBACK* get_link_url)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns the link URL, if any, to be used ONLY for "copy link address". We /// Returns the link URL, if any, to be used ONLY for "copy link address". We
// don't validate this field in the frontend process. /// don't validate this field in the frontend process.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_unfiltered_link_url)( cef_string_userfree_t(CEF_CALLBACK* get_unfiltered_link_url)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns the source URL, if any, for the element that the context menu was /// Returns the source URL, if any, for the element that the context menu was
// invoked on. Example of elements with source URLs are img, audio, and video. /// invoked on. Example of elements with source URLs are img, audio, and
/// video.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_source_url)( cef_string_userfree_t(CEF_CALLBACK* get_source_url)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns true (1) if the context menu was invoked on an image which has non- /// Returns true (1) if the context menu was invoked on an image which has
// NULL contents. /// non-NULL contents.
/// ///
int(CEF_CALLBACK* has_image_contents)( int(CEF_CALLBACK* has_image_contents)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns the title text or the alt text if the context menu was invoked on /// Returns the title text or the alt text if the context menu was invoked on
// an image. /// an image.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_title_text)( cef_string_userfree_t(CEF_CALLBACK* get_title_text)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns the URL of the top level page that the context menu was invoked on. /// Returns the URL of the top level page that the context menu was invoked
/// on.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_page_url)( cef_string_userfree_t(CEF_CALLBACK* get_page_url)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns the URL of the subframe that the context menu was invoked on. /// Returns the URL of the subframe that the context menu was invoked on.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_frame_url)( cef_string_userfree_t(CEF_CALLBACK* get_frame_url)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns the character encoding of the subframe that the context menu was /// Returns the character encoding of the subframe that the context menu was
// invoked on. /// invoked on.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_frame_charset)( cef_string_userfree_t(CEF_CALLBACK* get_frame_charset)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns the type of context node that the context menu was invoked on. /// Returns the type of context node that the context menu was invoked on.
/// ///
cef_context_menu_media_type_t(CEF_CALLBACK* get_media_type)( cef_context_menu_media_type_t(CEF_CALLBACK* get_media_type)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns flags representing the actions supported by the media element, if /// Returns flags representing the actions supported by the media element, if
// any, that the context menu was invoked on. /// any, that the context menu was invoked on.
/// ///
cef_context_menu_media_state_flags_t(CEF_CALLBACK* get_media_state_flags)( cef_context_menu_media_state_flags_t(CEF_CALLBACK* get_media_state_flags)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns the text of the selection, if any, that the context menu was /// Returns the text of the selection, if any, that the context menu was
// invoked on. /// invoked on.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_selection_text)( cef_string_userfree_t(CEF_CALLBACK* get_selection_text)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns the text of the misspelled word, if any, that the context menu was /// Returns the text of the misspelled word, if any, that the context menu was
// invoked on. /// invoked on.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_misspelled_word)( cef_string_userfree_t(CEF_CALLBACK* get_misspelled_word)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns true (1) if suggestions exist, false (0) otherwise. Fills in /// Returns true (1) if suggestions exist, false (0) otherwise. Fills in
// |suggestions| from the spell check service for the misspelled word if there /// |suggestions| from the spell check service for the misspelled word if
// is one. /// there is one.
/// ///
int(CEF_CALLBACK* get_dictionary_suggestions)( int(CEF_CALLBACK* get_dictionary_suggestions)(
struct _cef_context_menu_params_t* self, struct _cef_context_menu_params_t* self,
cef_string_list_t suggestions); cef_string_list_t suggestions);
/// ///
// Returns true (1) if the context menu was invoked on an editable node. /// Returns true (1) if the context menu was invoked on an editable node.
/// ///
int(CEF_CALLBACK* is_editable)(struct _cef_context_menu_params_t* self); int(CEF_CALLBACK* is_editable)(struct _cef_context_menu_params_t* self);
/// ///
// Returns true (1) if the context menu was invoked on an editable node where /// Returns true (1) if the context menu was invoked on an editable node where
// spell-check is enabled. /// spell-check is enabled.
/// ///
int(CEF_CALLBACK* is_spell_check_enabled)( int(CEF_CALLBACK* is_spell_check_enabled)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns flags representing the actions supported by the editable node, if /// Returns flags representing the actions supported by the editable node, if
// any, that the context menu was invoked on. /// any, that the context menu was invoked on.
/// ///
cef_context_menu_edit_state_flags_t(CEF_CALLBACK* get_edit_state_flags)( cef_context_menu_edit_state_flags_t(CEF_CALLBACK* get_edit_state_flags)(
struct _cef_context_menu_params_t* self); struct _cef_context_menu_params_t* self);
/// ///
// Returns true (1) if the context menu contains items specified by the /// Returns true (1) if the context menu contains items specified by the
// renderer process. /// renderer process.
/// ///
int(CEF_CALLBACK* is_custom_menu)(struct _cef_context_menu_params_t* self); int(CEF_CALLBACK* is_custom_menu)(struct _cef_context_menu_params_t* self);
} cef_context_menu_params_t; } cef_context_menu_params_t;

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=d9790a35d74621e985b917935a4fca74ba7db1e0$ // $hash=37b5e115ff7abd1df1b9913404b69505fb9fef29$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_COOKIE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_COOKIE_CAPI_H_
@ -52,29 +52,29 @@ struct _cef_delete_cookies_callback_t;
struct _cef_set_cookie_callback_t; struct _cef_set_cookie_callback_t;
/// ///
// Structure used for managing cookies. The functions of this structure may be /// Structure used for managing cookies. The functions of this structure may be
// called on any thread unless otherwise indicated. /// called on any thread unless otherwise indicated.
/// ///
typedef struct _cef_cookie_manager_t { typedef struct _cef_cookie_manager_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Visit all cookies on the UI thread. The returned cookies are ordered by /// Visit all cookies on the UI thread. The returned cookies are ordered by
// longest path, then by earliest creation date. Returns false (0) if cookies /// longest path, then by earliest creation date. Returns false (0) if cookies
// cannot be accessed. /// cannot be accessed.
/// ///
int(CEF_CALLBACK* visit_all_cookies)(struct _cef_cookie_manager_t* self, int(CEF_CALLBACK* visit_all_cookies)(struct _cef_cookie_manager_t* self,
struct _cef_cookie_visitor_t* visitor); struct _cef_cookie_visitor_t* visitor);
/// ///
// Visit a subset of cookies on the UI thread. The results are filtered by the /// Visit a subset of cookies on the UI thread. The results are filtered by
// given url scheme, host, domain and path. If |includeHttpOnly| is true (1) /// the given url scheme, host, domain and path. If |includeHttpOnly| is true
// HTTP-only cookies will also be included in the results. The returned /// (1) HTTP-only cookies will also be included in the results. The returned
// cookies are ordered by longest path, then by earliest creation date. /// cookies are ordered by longest path, then by earliest creation date.
// Returns false (0) if cookies cannot be accessed. /// Returns false (0) if cookies cannot be accessed.
/// ///
int(CEF_CALLBACK* visit_url_cookies)(struct _cef_cookie_manager_t* self, int(CEF_CALLBACK* visit_url_cookies)(struct _cef_cookie_manager_t* self,
const cef_string_t* url, const cef_string_t* url,
@ -82,13 +82,13 @@ typedef struct _cef_cookie_manager_t {
struct _cef_cookie_visitor_t* visitor); struct _cef_cookie_visitor_t* visitor);
/// ///
// Sets a cookie given a valid URL and explicit user-provided cookie /// Sets a cookie given a valid URL and explicit user-provided cookie
// attributes. This function expects each attribute to be well-formed. It will /// attributes. This function expects each attribute to be well-formed. It
// check for disallowed characters (e.g. the ';' character is disallowed /// will check for disallowed characters (e.g. the ';' character is disallowed
// within the cookie value attribute) and fail without setting the cookie if /// within the cookie value attribute) and fail without setting the cookie if
// such characters are found. If |callback| is non-NULL it will be executed /// such characters are found. If |callback| is non-NULL it will be executed
// asnychronously on the UI thread after the cookie has been set. Returns /// asnychronously on the UI thread after the cookie has been set. Returns
// false (0) if an invalid URL is specified or if cookies cannot be accessed. /// false (0) if an invalid URL is specified or if cookies cannot be accessed.
/// ///
int(CEF_CALLBACK* set_cookie)(struct _cef_cookie_manager_t* self, int(CEF_CALLBACK* set_cookie)(struct _cef_cookie_manager_t* self,
const cef_string_t* url, const cef_string_t* url,
@ -96,15 +96,15 @@ typedef struct _cef_cookie_manager_t {
struct _cef_set_cookie_callback_t* callback); struct _cef_set_cookie_callback_t* callback);
/// ///
// Delete all cookies that match the specified parameters. If both |url| and /// Delete all cookies that match the specified parameters. If both |url| and
// |cookie_name| values are specified all host and domain cookies matching /// |cookie_name| values are specified all host and domain cookies matching
// both will be deleted. If only |url| is specified all host cookies (but not /// both will be deleted. If only |url| is specified all host cookies (but not
// domain cookies) irrespective of path will be deleted. If |url| is NULL all /// domain cookies) irrespective of path will be deleted. If |url| is NULL all
// cookies for all hosts and domains will be deleted. If |callback| is non- /// cookies for all hosts and domains will be deleted. If |callback| is non-
// NULL it will be executed asnychronously on the UI thread after the cookies /// NULL it will be executed asnychronously on the UI thread after the cookies
// have been deleted. Returns false (0) if a non-NULL invalid URL is specified /// have been deleted. Returns false (0) if a non-NULL invalid URL is
// or if cookies cannot be accessed. Cookies can alternately be deleted using /// specified or if cookies cannot be accessed. Cookies can alternately be
// the Visit*Cookies() functions. /// deleted using the Visit*Cookies() functions.
/// ///
int(CEF_CALLBACK* delete_cookies)( int(CEF_CALLBACK* delete_cookies)(
struct _cef_cookie_manager_t* self, struct _cef_cookie_manager_t* self,
@ -113,41 +113,41 @@ typedef struct _cef_cookie_manager_t {
struct _cef_delete_cookies_callback_t* callback); struct _cef_delete_cookies_callback_t* callback);
/// ///
// Flush the backing store (if any) to disk. If |callback| is non-NULL it will /// Flush the backing store (if any) to disk. If |callback| is non-NULL it
// be executed asnychronously on the UI thread after the flush is complete. /// will be executed asnychronously on the UI thread after the flush is
// Returns false (0) if cookies cannot be accessed. /// complete. Returns false (0) if cookies cannot be accessed.
/// ///
int(CEF_CALLBACK* flush_store)(struct _cef_cookie_manager_t* self, int(CEF_CALLBACK* flush_store)(struct _cef_cookie_manager_t* self,
struct _cef_completion_callback_t* callback); struct _cef_completion_callback_t* callback);
} cef_cookie_manager_t; } cef_cookie_manager_t;
/// ///
// Returns the global cookie manager. By default data will be stored at /// Returns the global cookie manager. By default data will be stored at
// CefSettings.cache_path if specified or in memory otherwise. If |callback| is /// cef_settings_t.cache_path if specified or in memory otherwise. If |callback|
// non-NULL it will be executed asnychronously on the UI thread after the /// is non-NULL it will be executed asnychronously on the UI thread after the
// manager's storage has been initialized. Using this function is equivalent to /// manager's storage has been initialized. Using this function is equivalent to
// calling cef_request_context_t::cef_request_context_get_global_context()->GetD /// calling cef_request_context_t::cef_request_context_get_global_context()->Get
// efaultCookieManager(). /// DefaultCookieManager().
/// ///
CEF_EXPORT cef_cookie_manager_t* cef_cookie_manager_get_global_manager( CEF_EXPORT cef_cookie_manager_t* cef_cookie_manager_get_global_manager(
struct _cef_completion_callback_t* callback); struct _cef_completion_callback_t* callback);
/// ///
// Structure to implement for visiting cookie values. The functions of this /// Structure to implement for visiting cookie values. The functions of this
// structure will always be called on the UI thread. /// structure will always be called on the UI thread.
/// ///
typedef struct _cef_cookie_visitor_t { typedef struct _cef_cookie_visitor_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Method that will be called once for each cookie. |count| is the 0-based /// Method that will be called once for each cookie. |count| is the 0-based
// index for the current cookie. |total| is the total number of cookies. Set /// index for the current cookie. |total| is the total number of cookies. Set
// |deleteCookie| to true (1) to delete the cookie currently being visited. /// |deleteCookie| to true (1) to delete the cookie currently being visited.
// Return false (0) to stop visiting cookies. This function may never be /// Return false (0) to stop visiting cookies. This function may never be
// called if no cookies are found. /// called if no cookies are found.
/// ///
int(CEF_CALLBACK* visit)(struct _cef_cookie_visitor_t* self, int(CEF_CALLBACK* visit)(struct _cef_cookie_visitor_t* self,
const struct _cef_cookie_t* cookie, const struct _cef_cookie_t* cookie,
@ -157,36 +157,36 @@ typedef struct _cef_cookie_visitor_t {
} cef_cookie_visitor_t; } cef_cookie_visitor_t;
/// ///
// Structure to implement to be notified of asynchronous completion via /// Structure to implement to be notified of asynchronous completion via
// cef_cookie_manager_t::set_cookie(). /// cef_cookie_manager_t::set_cookie().
/// ///
typedef struct _cef_set_cookie_callback_t { typedef struct _cef_set_cookie_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Method that will be called upon completion. |success| will be true (1) if /// Method that will be called upon completion. |success| will be true (1) if
// the cookie was set successfully. /// the cookie was set successfully.
/// ///
void(CEF_CALLBACK* on_complete)(struct _cef_set_cookie_callback_t* self, void(CEF_CALLBACK* on_complete)(struct _cef_set_cookie_callback_t* self,
int success); int success);
} cef_set_cookie_callback_t; } cef_set_cookie_callback_t;
/// ///
// Structure to implement to be notified of asynchronous completion via /// Structure to implement to be notified of asynchronous completion via
// cef_cookie_manager_t::delete_cookies(). /// cef_cookie_manager_t::delete_cookies().
/// ///
typedef struct _cef_delete_cookies_callback_t { typedef struct _cef_delete_cookies_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Method that will be called upon completion. |num_deleted| will be the /// Method that will be called upon completion. |num_deleted| will be the
// number of cookies that were deleted. /// number of cookies that were deleted.
/// ///
void(CEF_CALLBACK* on_complete)(struct _cef_delete_cookies_callback_t* self, void(CEF_CALLBACK* on_complete)(struct _cef_delete_cookies_callback_t* self,
int num_deleted); int num_deleted);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=5d111a67218403f78737f2c4dc92d2fd96dc125d$ // $hash=1ce19c3213f033ca9059da738102b9b4292d4a06$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_CRASH_UTIL_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_CRASH_UTIL_CAPI_H_
@ -47,99 +47,102 @@ extern "C" {
#endif #endif
/// ///
// Crash reporting is configured using an INI-style config file named /// Crash reporting is configured using an INI-style config file named
// "crash_reporter.cfg". On Windows and Linux this file must be placed next to /// "crash_reporter.cfg". On Windows and Linux this file must be placed next to
// the main application executable. On macOS this file must be placed in the /// the main application executable. On macOS this file must be placed in the
// top-level app bundle Resources directory (e.g. /// top-level app bundle Resources directory (e.g.
// "<appname>.app/Contents/Resources"). File contents are as follows: /// "<appname>.app/Contents/Resources"). File contents are as follows:
// ///
// # Comments start with a hash character and must be on their own line. /// <pre>
// /// # Comments start with a hash character and must be on their own line.
// [Config] ///
// ProductName=<Value of the "prod" crash key; defaults to "cef"> /// [Config]
// ProductVersion=<Value of the "ver" crash key; defaults to the CEF version> /// ProductName=<Value of the "prod" crash key; defaults to "cef">
// AppName=<Windows only; App-specific folder name component for storing crash /// ProductVersion=<Value of the "ver" crash key; defaults to the CEF version>
// information; default to "CEF"> /// AppName=<Windows only; App-specific folder name component for storing crash
// ExternalHandler=<Windows only; Name of the external handler exe to use /// information; default to "CEF">
// instead of re-launching the main exe; default to empty> /// ExternalHandler=<Windows only; Name of the external handler exe to use
// BrowserCrashForwardingEnabled=<macOS only; True if browser process crashes /// instead of re-launching the main exe; default to empty>
// should be forwarded to the system crash /// BrowserCrashForwardingEnabled=<macOS only; True if browser process crashes
// reporter; default to false> /// should be forwarded to the system crash
// ServerURL=<crash server URL; default to empty> /// reporter; default to false>
// RateLimitEnabled=<True if uploads should be rate limited; default to true> /// ServerURL=<crash server URL; default to empty>
// MaxUploadsPerDay=<Max uploads per 24 hours, used if rate limit is enabled; /// RateLimitEnabled=<True if uploads should be rate limited; default to true>
// default to 5> /// MaxUploadsPerDay=<Max uploads per 24 hours, used if rate limit is enabled;
// MaxDatabaseSizeInMb=<Total crash report disk usage greater than this value /// default to 5>
// will cause older reports to be deleted; default to 20> /// MaxDatabaseSizeInMb=<Total crash report disk usage greater than this value
// MaxDatabaseAgeInDays=<Crash reports older than this value will be deleted; /// will cause older reports to be deleted; default to 20>
// default to 5> /// MaxDatabaseAgeInDays=<Crash reports older than this value will be deleted;
// /// default to 5>
// [CrashKeys] ///
// my_key1=<small|medium|large> /// [CrashKeys]
// my_key2=<small|medium|large> /// my_key1=<small|medium|large>
// /// my_key2=<small|medium|large>
// Config section: /// </pre>
// ///
// If "ProductName" and/or "ProductVersion" are set then the specified values /// <b>Config section:</b>
// will be included in the crash dump metadata. On macOS if these values are set ///
// to NULL then they will be retrieved from the Info.plist file using the /// If "ProductName" and/or "ProductVersion" are set then the specified values
// "CFBundleName" and "CFBundleShortVersionString" keys respectively. /// will be included in the crash dump metadata. On macOS if these values are
// /// set to NULL then they will be retrieved from the Info.plist file using the
// If "AppName" is set on Windows then crash report information (metrics, /// "CFBundleName" and "CFBundleShortVersionString" keys respectively.
// database and dumps) will be stored locally on disk under the ///
// "C:\Users\[CurrentUser]\AppData\Local\[AppName]\User Data" folder. On other /// If "AppName" is set on Windows then crash report information (metrics,
// platforms the CefSettings.user_data_path value will be used. /// database and dumps) will be stored locally on disk under the
// /// "C:\Users\[CurrentUser]\AppData\Local\[AppName]\User Data" folder. On other
// If "ExternalHandler" is set on Windows then the specified exe will be /// platforms the cef_settings_t.user_data_path value will be used.
// launched as the crashpad-handler instead of re-launching the main process ///
// exe. The value can be an absolute path or a path relative to the main exe /// If "ExternalHandler" is set on Windows then the specified exe will be
// directory. On Linux the CefSettings.browser_subprocess_path value will be /// launched as the crashpad-handler instead of re-launching the main process
// used. On macOS the existing subprocess app bundle will be used. /// exe. The value can be an absolute path or a path relative to the main exe
// /// directory. On Linux the cef_settings_t.browser_subprocess_path value will be
// If "BrowserCrashForwardingEnabled" is set to true (1) on macOS then browser /// used. On macOS the existing subprocess app bundle will be used.
// process crashes will be forwarded to the system crash reporter. This results ///
// in the crash UI dialog being displayed to the user and crash reports being /// If "BrowserCrashForwardingEnabled" is set to true (1) on macOS then browser
// logged under "~/Library/Logs/DiagnosticReports". Forwarding of crash reports /// process crashes will be forwarded to the system crash reporter. This results
// from non-browser processes and Debug builds is always disabled. /// in the crash UI dialog being displayed to the user and crash reports being
// /// logged under "~/Library/Logs/DiagnosticReports". Forwarding of crash reports
// If "ServerURL" is set then crashes will be uploaded as a multi-part POST /// from non-browser processes and Debug builds is always disabled.
// request to the specified URL. Otherwise, reports will only be stored locally ///
// on disk. /// If "ServerURL" is set then crashes will be uploaded as a multi-part POST
// /// request to the specified URL. Otherwise, reports will only be stored locally
// If "RateLimitEnabled" is set to true (1) then crash report uploads will be /// on disk.
// rate limited as follows: ///
// 1. If "MaxUploadsPerDay" is set to a positive value then at most the /// If "RateLimitEnabled" is set to true (1) then crash report uploads will be
// specified number of crashes will be uploaded in each 24 hour period. /// rate limited as follows:
// 2. If crash upload fails due to a network or server error then an /// 1. If "MaxUploadsPerDay" is set to a positive value then at most the
// incremental backoff delay up to a maximum of 24 hours will be applied for /// specified number of crashes will be uploaded in each 24 hour period.
// retries. /// 2. If crash upload fails due to a network or server error then an
// 3. If a backoff delay is applied and "MaxUploadsPerDay" is > 1 then the /// incremental backoff delay up to a maximum of 24 hours will be applied
// "MaxUploadsPerDay" value will be reduced to 1 until the client is /// for retries.
// restarted. This helps to avoid an upload flood when the network or /// 3. If a backoff delay is applied and "MaxUploadsPerDay" is > 1 then the
// server error is resolved. /// "MaxUploadsPerDay" value will be reduced to 1 until the client is
// Rate limiting is not supported on Linux. /// restarted. This helps to avoid an upload flood when the network or
// /// server error is resolved.
// If "MaxDatabaseSizeInMb" is set to a positive value then crash report storage /// Rate limiting is not supported on Linux.
// on disk will be limited to that size in megabytes. For example, on Windows ///
// each dump is about 600KB so a "MaxDatabaseSizeInMb" value of 20 equates to /// If "MaxDatabaseSizeInMb" is set to a positive value then crash report
// about 34 crash reports stored on disk. Not supported on Linux. /// storage on disk will be limited to that size in megabytes. For example, on
// /// Windows each dump is about 600KB so a "MaxDatabaseSizeInMb" value of 20
// If "MaxDatabaseAgeInDays" is set to a positive value then crash reports older /// equates to about 34 crash reports stored on disk. Not supported on Linux.
// than the specified age in days will be deleted. Not supported on Linux. ///
// /// If "MaxDatabaseAgeInDays" is set to a positive value then crash reports
// CrashKeys section: /// older than the specified age in days will be deleted. Not supported on
// /// Linux.
// A maximum of 26 crash keys of each size can be specified for use by the ///
// application. Crash key values will be truncated based on the specified size /// <b>CrashKeys section:</b>
// (small = 64 bytes, medium = 256 bytes, large = 1024 bytes). The value of ///
// crash keys can be set from any thread or process using the /// A maximum of 26 crash keys of each size can be specified for use by the
// CefSetCrashKeyValue function. These key/value pairs will be sent to the crash /// application. Crash key values will be truncated based on the specified size
// server along with the crash dump file. /// (small = 64 bytes, medium = 256 bytes, large = 1024 bytes). The value of
/// crash keys can be set from any thread or process using the
/// CefSetCrashKeyValue function. These key/value pairs will be sent to the
/// crash server along with the crash dump file.
/// ///
CEF_EXPORT int cef_crash_reporting_enabled(void); CEF_EXPORT int cef_crash_reporting_enabled(void);
/// ///
// Sets or clears a specific key-value pair from the crash metadata. /// Sets or clears a specific key-value pair from the crash metadata.
/// ///
CEF_EXPORT void cef_set_crash_key_value(const cef_string_t* key, CEF_EXPORT void cef_set_crash_key_value(const cef_string_t* key,
const cef_string_t* value); const cef_string_t* value);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=ec62239c2b24ff512b64ca758be825ff57fb3b6b$ // $hash=076a01db2fc4241efeb46c5f247a9737fd828f9b$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_DEVTOOLS_MESSAGE_OBSERVER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_DEVTOOLS_MESSAGE_OBSERVER_CAPI_H_
@ -49,35 +49,36 @@ extern "C" {
struct _cef_browser_t; struct _cef_browser_t;
/// ///
// Callback structure for cef_browser_host_t::AddDevToolsMessageObserver. The /// Callback structure for cef_browser_host_t::AddDevToolsMessageObserver. The
// functions of this structure will be called on the browser process UI thread. /// functions of this structure will be called on the browser process UI thread.
/// ///
typedef struct _cef_dev_tools_message_observer_t { typedef struct _cef_dev_tools_message_observer_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Method that will be called on receipt of a DevTools protocol message. /// Method that will be called on receipt of a DevTools protocol message.
// |browser| is the originating browser instance. |message| is a UTF8-encoded /// |browser| is the originating browser instance. |message| is a UTF8-encoded
// JSON dictionary representing either a function result or an event. /// JSON dictionary representing either a function result or an event.
// |message| is only valid for the scope of this callback and should be copied /// |message| is only valid for the scope of this callback and should be
// if necessary. Return true (1) if the message was handled or false (0) if /// copied if necessary. Return true (1) if the message was handled or false
// the message should be further processed and passed to the /// (0) if the message should be further processed and passed to the
// OnDevToolsMethodResult or OnDevToolsEvent functions as appropriate. /// OnDevToolsMethodResult or OnDevToolsEvent functions as appropriate.
// ///
// Method result dictionaries include an "id" (int) value that identifies the /// Method result dictionaries include an "id" (int) value that identifies the
// orginating function call sent from cef_browser_host_t::SendDevToolsMessage, /// orginating function call sent from
// and optionally either a "result" (dictionary) or "error" (dictionary) /// cef_browser_host_t::SendDevToolsMessage, and optionally either a "result"
// value. The "error" dictionary will contain "code" (int) and "message" /// (dictionary) or "error" (dictionary) value. The "error" dictionary will
// (string) values. Event dictionaries include a "function" (string) value and /// contain "code" (int) and "message" (string) values. Event dictionaries
// optionally a "params" (dictionary) value. See the DevTools protocol /// include a "function" (string) value and optionally a "params" (dictionary)
// documentation at https://chromedevtools.github.io/devtools-protocol/ for /// value. See the DevTools protocol documentation at
// details of supported function calls and the expected "result" or "params" /// https://chromedevtools.github.io/devtools-protocol/ for details of
// dictionary contents. JSON dictionaries can be parsed using the CefParseJSON /// supported function calls and the expected "result" or "params" dictionary
// function if desired, however be aware of performance considerations when /// contents. JSON dictionaries can be parsed using the CefParseJSON function
// parsing large messages (some of which may exceed 1MB in size). /// if desired, however be aware of performance considerations when parsing
/// large messages (some of which may exceed 1MB in size).
/// ///
int(CEF_CALLBACK* on_dev_tools_message)( int(CEF_CALLBACK* on_dev_tools_message)(
struct _cef_dev_tools_message_observer_t* self, struct _cef_dev_tools_message_observer_t* self,
@ -86,16 +87,16 @@ typedef struct _cef_dev_tools_message_observer_t {
size_t message_size); size_t message_size);
/// ///
// Method that will be called after attempted execution of a DevTools protocol /// Method that will be called after attempted execution of a DevTools
// function. |browser| is the originating browser instance. |message_id| is /// protocol function. |browser| is the originating browser instance.
// the "id" value that identifies the originating function call message. If /// |message_id| is the "id" value that identifies the originating function
// the function succeeded |success| will be true (1) and |result| will be the /// call message. If the function succeeded |success| will be true (1) and
// UTF8-encoded JSON "result" dictionary value (which may be NULL). If the /// |result| will be the UTF8-encoded JSON "result" dictionary value (which
// function failed |success| will be false (0) and |result| will be the /// may be NULL). If the function failed |success| will be false (0) and
// UTF8-encoded JSON "error" dictionary value. |result| is only valid for the /// |result| will be the UTF8-encoded JSON "error" dictionary value. |result|
// scope of this callback and should be copied if necessary. See the /// is only valid for the scope of this callback and should be copied if
// OnDevToolsMessage documentation for additional details on |result| /// necessary. See the OnDevToolsMessage documentation for additional details
// contents. /// on |result| contents.
/// ///
void(CEF_CALLBACK* on_dev_tools_method_result)( void(CEF_CALLBACK* on_dev_tools_method_result)(
struct _cef_dev_tools_message_observer_t* self, struct _cef_dev_tools_message_observer_t* self,
@ -106,12 +107,12 @@ typedef struct _cef_dev_tools_message_observer_t {
size_t result_size); size_t result_size);
/// ///
// Method that will be called on receipt of a DevTools protocol event. /// Method that will be called on receipt of a DevTools protocol event.
// |browser| is the originating browser instance. |function| is the "function" /// |browser| is the originating browser instance. |function| is the
// value. |params| is the UTF8-encoded JSON "params" dictionary value (which /// "function" value. |params| is the UTF8-encoded JSON "params" dictionary
// may be NULL). |params| is only valid for the scope of this callback and /// value (which may be NULL). |params| is only valid for the scope of this
// should be copied if necessary. See the OnDevToolsMessage documentation for /// callback and should be copied if necessary. See the OnDevToolsMessage
// additional details on |params| contents. /// documentation for additional details on |params| contents.
/// ///
void(CEF_CALLBACK* on_dev_tools_event)( void(CEF_CALLBACK* on_dev_tools_event)(
struct _cef_dev_tools_message_observer_t* self, struct _cef_dev_tools_message_observer_t* self,
@ -121,19 +122,19 @@ typedef struct _cef_dev_tools_message_observer_t {
size_t params_size); size_t params_size);
/// ///
// Method that will be called when the DevTools agent has attached. |browser| /// Method that will be called when the DevTools agent has attached. |browser|
// is the originating browser instance. This will generally occur in response /// is the originating browser instance. This will generally occur in response
// to the first message sent while the agent is detached. /// to the first message sent while the agent is detached.
/// ///
void(CEF_CALLBACK* on_dev_tools_agent_attached)( void(CEF_CALLBACK* on_dev_tools_agent_attached)(
struct _cef_dev_tools_message_observer_t* self, struct _cef_dev_tools_message_observer_t* self,
struct _cef_browser_t* browser); struct _cef_browser_t* browser);
/// ///
// Method that will be called when the DevTools agent has detached. |browser| /// Method that will be called when the DevTools agent has detached. |browser|
// is the originating browser instance. Any function results that were pending /// is the originating browser instance. Any function results that were
// before the agent became detached will not be delivered, and any active /// pending before the agent became detached will not be delivered, and any
// event subscriptions will be canceled. /// active event subscriptions will be canceled.
/// ///
void(CEF_CALLBACK* on_dev_tools_agent_detached)( void(CEF_CALLBACK* on_dev_tools_agent_detached)(
struct _cef_dev_tools_message_observer_t* self, struct _cef_dev_tools_message_observer_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=dc579beb1f25f9bbdb72afb4b5b381e129f84e31$ // $hash=3a1a3ac84690c6090d356ddec3ddb49b934fe28c$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_DIALOG_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_DIALOG_HANDLER_CAPI_H_
@ -48,51 +48,51 @@ extern "C" {
#endif #endif
/// ///
// Callback structure for asynchronous continuation of file dialog requests. /// Callback structure for asynchronous continuation of file dialog requests.
/// ///
typedef struct _cef_file_dialog_callback_t { typedef struct _cef_file_dialog_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Continue the file selection. |file_paths| should be a single value or a /// Continue the file selection. |file_paths| should be a single value or a
// list of values depending on the dialog mode. An NULL |file_paths| value is /// list of values depending on the dialog mode. An NULL |file_paths| value is
// treated the same as calling cancel(). /// treated the same as calling cancel().
/// ///
void(CEF_CALLBACK* cont)(struct _cef_file_dialog_callback_t* self, void(CEF_CALLBACK* cont)(struct _cef_file_dialog_callback_t* self,
cef_string_list_t file_paths); cef_string_list_t file_paths);
/// ///
// Cancel the file selection. /// Cancel the file selection.
/// ///
void(CEF_CALLBACK* cancel)(struct _cef_file_dialog_callback_t* self); void(CEF_CALLBACK* cancel)(struct _cef_file_dialog_callback_t* self);
} cef_file_dialog_callback_t; } cef_file_dialog_callback_t;
/// ///
// Implement this structure to handle dialog events. The functions of this /// Implement this structure to handle dialog events. The functions of this
// structure will be called on the browser process UI thread. /// structure will be called on the browser process UI thread.
/// ///
typedef struct _cef_dialog_handler_t { typedef struct _cef_dialog_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called to run a file chooser dialog. |mode| represents the type of dialog /// Called to run a file chooser dialog. |mode| represents the type of dialog
// to display. |title| to the title to be used for the dialog and may be NULL /// to display. |title| to the title to be used for the dialog and may be NULL
// to show the default title ("Open" or "Save" depending on the mode). /// to show the default title ("Open" or "Save" depending on the mode).
// |default_file_path| is the path with optional directory and/or file name /// |default_file_path| is the path with optional directory and/or file name
// component that should be initially selected in the dialog. |accept_filters| /// component that should be initially selected in the dialog.
// are used to restrict the selectable file types and may any combination of /// |accept_filters| are used to restrict the selectable file types and may
// (a) valid lower-cased MIME types (e.g. "text/*" or "image/*"), (b) /// any combination of (a) valid lower-cased MIME types (e.g. "text/*" or
// individual file extensions (e.g. ".txt" or ".png"), or (c) combined /// "image/*"), (b) individual file extensions (e.g. ".txt" or ".png"), or (c)
// description and file extension delimited using "|" and ";" (e.g. "Image /// combined description and file extension delimited using "|" and ";" (e.g.
// Types|.png;.gif;.jpg"). To display a custom dialog return true (1) and /// "Image Types|.png;.gif;.jpg"). To display a custom dialog return true (1)
// execute |callback| either inline or at a later time. To display the default /// and execute |callback| either inline or at a later time. To display the
// dialog return false (0). /// default dialog return false (0).
/// ///
int(CEF_CALLBACK* on_file_dialog)( int(CEF_CALLBACK* on_file_dialog)(
struct _cef_dialog_handler_t* self, struct _cef_dialog_handler_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=adb78c1968bb0634d6255e1b5e49b56211da4fa8$ // $hash=976a61df924efbcb0c53afeb75265e5e9e80c2de$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_DISPLAY_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_DISPLAY_HANDLER_CAPI_H_
@ -49,17 +49,17 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to handle events related to browser display state. /// Implement this structure to handle events related to browser display state.
// The functions of this structure will be called on the UI thread. /// The functions of this structure will be called on the UI thread.
/// ///
typedef struct _cef_display_handler_t { typedef struct _cef_display_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called when a frame's address has changed. /// Called when a frame's address has changed.
/// ///
void(CEF_CALLBACK* on_address_change)(struct _cef_display_handler_t* self, void(CEF_CALLBACK* on_address_change)(struct _cef_display_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -67,25 +67,25 @@ typedef struct _cef_display_handler_t {
const cef_string_t* url); const cef_string_t* url);
/// ///
// Called when the page title changes. /// Called when the page title changes.
/// ///
void(CEF_CALLBACK* on_title_change)(struct _cef_display_handler_t* self, void(CEF_CALLBACK* on_title_change)(struct _cef_display_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
const cef_string_t* title); const cef_string_t* title);
/// ///
// Called when the page icon changes. /// Called when the page icon changes.
/// ///
void(CEF_CALLBACK* on_favicon_urlchange)(struct _cef_display_handler_t* self, void(CEF_CALLBACK* on_favicon_urlchange)(struct _cef_display_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
cef_string_list_t icon_urls); cef_string_list_t icon_urls);
/// ///
// Called when web content in the page has toggled fullscreen mode. If /// Called when web content in the page has toggled fullscreen mode. If
// |fullscreen| is true (1) the content will automatically be sized to fill /// |fullscreen| is true (1) the content will automatically be sized to fill
// the browser content area. If |fullscreen| is false (0) the content will /// the browser content area. If |fullscreen| is false (0) the content will
// automatically return to its original size and position. The client is /// automatically return to its original size and position. The client is
// responsible for resizing the browser if desired. /// responsible for resizing the browser if desired.
/// ///
void(CEF_CALLBACK* on_fullscreen_mode_change)( void(CEF_CALLBACK* on_fullscreen_mode_change)(
struct _cef_display_handler_t* self, struct _cef_display_handler_t* self,
@ -93,28 +93,28 @@ typedef struct _cef_display_handler_t {
int fullscreen); int fullscreen);
/// ///
// Called when the browser is about to display a tooltip. |text| contains the /// Called when the browser is about to display a tooltip. |text| contains the
// text that will be displayed in the tooltip. To handle the display of the /// text that will be displayed in the tooltip. To handle the display of the
// tooltip yourself return true (1). Otherwise, you can optionally modify /// tooltip yourself return true (1). Otherwise, you can optionally modify
// |text| and then return false (0) to allow the browser to display the /// |text| and then return false (0) to allow the browser to display the
// tooltip. When window rendering is disabled the application is responsible /// tooltip. When window rendering is disabled the application is responsible
// for drawing tooltips and the return value is ignored. /// for drawing tooltips and the return value is ignored.
/// ///
int(CEF_CALLBACK* on_tooltip)(struct _cef_display_handler_t* self, int(CEF_CALLBACK* on_tooltip)(struct _cef_display_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
cef_string_t* text); cef_string_t* text);
/// ///
// Called when the browser receives a status message. |value| contains the /// Called when the browser receives a status message. |value| contains the
// text that will be displayed in the status message. /// text that will be displayed in the status message.
/// ///
void(CEF_CALLBACK* on_status_message)(struct _cef_display_handler_t* self, void(CEF_CALLBACK* on_status_message)(struct _cef_display_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
const cef_string_t* value); const cef_string_t* value);
/// ///
// Called to display a console message. Return true (1) to stop the message /// Called to display a console message. Return true (1) to stop the message
// from being output to the console. /// from being output to the console.
/// ///
int(CEF_CALLBACK* on_console_message)(struct _cef_display_handler_t* self, int(CEF_CALLBACK* on_console_message)(struct _cef_display_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -124,18 +124,18 @@ typedef struct _cef_display_handler_t {
int line); int line);
/// ///
// Called when auto-resize is enabled via /// Called when auto-resize is enabled via
// cef_browser_host_t::SetAutoResizeEnabled and the contents have auto- /// cef_browser_host_t::SetAutoResizeEnabled and the contents have auto-
// resized. |new_size| will be the desired size in view coordinates. Return /// resized. |new_size| will be the desired size in view coordinates. Return
// true (1) if the resize was handled or false (0) for default handling. /// true (1) if the resize was handled or false (0) for default handling.
/// ///
int(CEF_CALLBACK* on_auto_resize)(struct _cef_display_handler_t* self, int(CEF_CALLBACK* on_auto_resize)(struct _cef_display_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
const cef_size_t* new_size); const cef_size_t* new_size);
/// ///
// Called when the overall page loading progress has changed. |progress| /// Called when the overall page loading progress has changed. |progress|
// ranges from 0.0 to 1.0. /// ranges from 0.0 to 1.0.
/// ///
void(CEF_CALLBACK* on_loading_progress_change)( void(CEF_CALLBACK* on_loading_progress_change)(
struct _cef_display_handler_t* self, struct _cef_display_handler_t* self,
@ -143,10 +143,10 @@ typedef struct _cef_display_handler_t {
double progress); double progress);
/// ///
// Called when the browser's cursor has changed. If |type| is CT_CUSTOM then /// Called when the browser's cursor has changed. If |type| is CT_CUSTOM then
// |custom_cursor_info| will be populated with the custom cursor information. /// |custom_cursor_info| will be populated with the custom cursor information.
// Return true (1) if the cursor change was handled or false (0) for default /// Return true (1) if the cursor change was handled or false (0) for default
// handling. /// handling.
/// ///
int(CEF_CALLBACK* on_cursor_change)( int(CEF_CALLBACK* on_cursor_change)(
struct _cef_display_handler_t* self, struct _cef_display_handler_t* self,
@ -156,8 +156,8 @@ typedef struct _cef_display_handler_t {
const cef_cursor_info_t* custom_cursor_info); const cef_cursor_info_t* custom_cursor_info);
/// ///
// Called when the browser's access to an audio and/or video source has /// Called when the browser's access to an audio and/or video source has
// changed. /// changed.
/// ///
void(CEF_CALLBACK* on_media_access_change)( void(CEF_CALLBACK* on_media_access_change)(
struct _cef_display_handler_t* self, struct _cef_display_handler_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=ddff4ad975fc26d0abfe05799aedb597b8274ffd$ // $hash=47d8c186f687b65c8e7f394b97d72530e67593cd$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_DOM_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_DOM_CAPI_H_
@ -50,120 +50,120 @@ struct _cef_domdocument_t;
struct _cef_domnode_t; struct _cef_domnode_t;
/// ///
// Structure to implement for visiting the DOM. The functions of this structure /// Structure to implement for visiting the DOM. The functions of this structure
// will be called on the render process main thread. /// will be called on the render process main thread.
/// ///
typedef struct _cef_domvisitor_t { typedef struct _cef_domvisitor_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Method executed for visiting the DOM. The document object passed to this /// Method executed for visiting the DOM. The document object passed to this
// function represents a snapshot of the DOM at the time this function is /// function represents a snapshot of the DOM at the time this function is
// executed. DOM objects are only valid for the scope of this function. Do not /// executed. DOM objects are only valid for the scope of this function. Do
// keep references to or attempt to access any DOM objects outside the scope /// not keep references to or attempt to access any DOM objects outside the
// of this function. /// scope of this function.
/// ///
void(CEF_CALLBACK* visit)(struct _cef_domvisitor_t* self, void(CEF_CALLBACK* visit)(struct _cef_domvisitor_t* self,
struct _cef_domdocument_t* document); struct _cef_domdocument_t* document);
} cef_domvisitor_t; } cef_domvisitor_t;
/// ///
// Structure used to represent a DOM document. The functions of this structure /// Structure used to represent a DOM document. The functions of this structure
// should only be called on the render process main thread thread. /// should only be called on the render process main thread thread.
/// ///
typedef struct _cef_domdocument_t { typedef struct _cef_domdocument_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns the document type. /// Returns the document type.
/// ///
cef_dom_document_type_t(CEF_CALLBACK* get_type)( cef_dom_document_type_t(CEF_CALLBACK* get_type)(
struct _cef_domdocument_t* self); struct _cef_domdocument_t* self);
/// ///
// Returns the root document node. /// Returns the root document node.
/// ///
struct _cef_domnode_t*(CEF_CALLBACK* get_document)( struct _cef_domnode_t*(CEF_CALLBACK* get_document)(
struct _cef_domdocument_t* self); struct _cef_domdocument_t* self);
/// ///
// Returns the BODY node of an HTML document. /// Returns the BODY node of an HTML document.
/// ///
struct _cef_domnode_t*(CEF_CALLBACK* get_body)( struct _cef_domnode_t*(CEF_CALLBACK* get_body)(
struct _cef_domdocument_t* self); struct _cef_domdocument_t* self);
/// ///
// Returns the HEAD node of an HTML document. /// Returns the HEAD node of an HTML document.
/// ///
struct _cef_domnode_t*(CEF_CALLBACK* get_head)( struct _cef_domnode_t*(CEF_CALLBACK* get_head)(
struct _cef_domdocument_t* self); struct _cef_domdocument_t* self);
/// ///
// Returns the title of an HTML document. /// Returns the title of an HTML document.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_title)( cef_string_userfree_t(CEF_CALLBACK* get_title)(
struct _cef_domdocument_t* self); struct _cef_domdocument_t* self);
/// ///
// Returns the document element with the specified ID value. /// Returns the document element with the specified ID value.
/// ///
struct _cef_domnode_t*(CEF_CALLBACK* get_element_by_id)( struct _cef_domnode_t*(CEF_CALLBACK* get_element_by_id)(
struct _cef_domdocument_t* self, struct _cef_domdocument_t* self,
const cef_string_t* id); const cef_string_t* id);
/// ///
// Returns the node that currently has keyboard focus. /// Returns the node that currently has keyboard focus.
/// ///
struct _cef_domnode_t*(CEF_CALLBACK* get_focused_node)( struct _cef_domnode_t*(CEF_CALLBACK* get_focused_node)(
struct _cef_domdocument_t* self); struct _cef_domdocument_t* self);
/// ///
// Returns true (1) if a portion of the document is selected. /// Returns true (1) if a portion of the document is selected.
/// ///
int(CEF_CALLBACK* has_selection)(struct _cef_domdocument_t* self); int(CEF_CALLBACK* has_selection)(struct _cef_domdocument_t* self);
/// ///
// Returns the selection offset within the start node. /// Returns the selection offset within the start node.
/// ///
int(CEF_CALLBACK* get_selection_start_offset)( int(CEF_CALLBACK* get_selection_start_offset)(
struct _cef_domdocument_t* self); struct _cef_domdocument_t* self);
/// ///
// Returns the selection offset within the end node. /// Returns the selection offset within the end node.
/// ///
int(CEF_CALLBACK* get_selection_end_offset)(struct _cef_domdocument_t* self); int(CEF_CALLBACK* get_selection_end_offset)(struct _cef_domdocument_t* self);
/// ///
// Returns the contents of this selection as markup. /// Returns the contents of this selection as markup.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_selection_as_markup)( cef_string_userfree_t(CEF_CALLBACK* get_selection_as_markup)(
struct _cef_domdocument_t* self); struct _cef_domdocument_t* self);
/// ///
// Returns the contents of this selection as text. /// Returns the contents of this selection as text.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_selection_as_text)( cef_string_userfree_t(CEF_CALLBACK* get_selection_as_text)(
struct _cef_domdocument_t* self); struct _cef_domdocument_t* self);
/// ///
// Returns the base URL for the document. /// Returns the base URL for the document.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_base_url)( cef_string_userfree_t(CEF_CALLBACK* get_base_url)(
struct _cef_domdocument_t* self); struct _cef_domdocument_t* self);
/// ///
// Returns a complete URL based on the document base URL and the specified /// Returns a complete URL based on the document base URL and the specified
// partial URL. /// partial URL.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_complete_url)( cef_string_userfree_t(CEF_CALLBACK* get_complete_url)(
@ -172,141 +172,139 @@ typedef struct _cef_domdocument_t {
} cef_domdocument_t; } cef_domdocument_t;
/// ///
// Structure used to represent a DOM node. The functions of this structure /// Structure used to represent a DOM node. The functions of this structure
// should only be called on the render process main thread. /// should only be called on the render process main thread.
/// ///
typedef struct _cef_domnode_t { typedef struct _cef_domnode_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns the type for this node. /// Returns the type for this node.
/// ///
cef_dom_node_type_t(CEF_CALLBACK* get_type)(struct _cef_domnode_t* self); cef_dom_node_type_t(CEF_CALLBACK* get_type)(struct _cef_domnode_t* self);
/// ///
// Returns true (1) if this is a text node. /// Returns true (1) if this is a text node.
/// ///
int(CEF_CALLBACK* is_text)(struct _cef_domnode_t* self); int(CEF_CALLBACK* is_text)(struct _cef_domnode_t* self);
/// ///
// Returns true (1) if this is an element node. /// Returns true (1) if this is an element node.
/// ///
int(CEF_CALLBACK* is_element)(struct _cef_domnode_t* self); int(CEF_CALLBACK* is_element)(struct _cef_domnode_t* self);
/// ///
// Returns true (1) if this is an editable node. /// Returns true (1) if this is an editable node.
/// ///
int(CEF_CALLBACK* is_editable)(struct _cef_domnode_t* self); int(CEF_CALLBACK* is_editable)(struct _cef_domnode_t* self);
/// ///
// Returns true (1) if this is a form control element node. /// Returns true (1) if this is a form control element node.
/// ///
int(CEF_CALLBACK* is_form_control_element)(struct _cef_domnode_t* self); int(CEF_CALLBACK* is_form_control_element)(struct _cef_domnode_t* self);
/// ///
// Returns the type of this form control element node. /// Returns the type of this form control element node.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_form_control_element_type)( cef_string_userfree_t(CEF_CALLBACK* get_form_control_element_type)(
struct _cef_domnode_t* self); struct _cef_domnode_t* self);
/// ///
// Returns true (1) if this object is pointing to the same handle as |that| /// Returns true (1) if this object is pointing to the same handle as |that|
// object. /// object.
/// ///
int(CEF_CALLBACK* is_same)(struct _cef_domnode_t* self, int(CEF_CALLBACK* is_same)(struct _cef_domnode_t* self,
struct _cef_domnode_t* that); struct _cef_domnode_t* that);
/// ///
// Returns the name of this node. /// Returns the name of this node.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_name)(struct _cef_domnode_t* self); cef_string_userfree_t(CEF_CALLBACK* get_name)(struct _cef_domnode_t* self);
/// ///
// Returns the value of this node. /// Returns the value of this node.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_value)(struct _cef_domnode_t* self); cef_string_userfree_t(CEF_CALLBACK* get_value)(struct _cef_domnode_t* self);
/// ///
// Set the value of this node. Returns true (1) on success. /// Set the value of this node. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_value)(struct _cef_domnode_t* self, int(CEF_CALLBACK* set_value)(struct _cef_domnode_t* self,
const cef_string_t* value); const cef_string_t* value);
/// ///
// Returns the contents of this node as markup. /// Returns the contents of this node as markup.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_as_markup)( cef_string_userfree_t(CEF_CALLBACK* get_as_markup)(
struct _cef_domnode_t* self); struct _cef_domnode_t* self);
/// ///
// Returns the document associated with this node. /// Returns the document associated with this node.
/// ///
struct _cef_domdocument_t*(CEF_CALLBACK* get_document)( struct _cef_domdocument_t*(CEF_CALLBACK* get_document)(
struct _cef_domnode_t* self); struct _cef_domnode_t* self);
/// ///
// Returns the parent node. /// Returns the parent node.
/// ///
struct _cef_domnode_t*(CEF_CALLBACK* get_parent)(struct _cef_domnode_t* self); struct _cef_domnode_t*(CEF_CALLBACK* get_parent)(struct _cef_domnode_t* self);
/// ///
// Returns the previous sibling node. /// Returns the previous sibling node.
/// ///
struct _cef_domnode_t*(CEF_CALLBACK* get_previous_sibling)( struct _cef_domnode_t*(CEF_CALLBACK* get_previous_sibling)(
struct _cef_domnode_t* self); struct _cef_domnode_t* self);
/// ///
// Returns the next sibling node. /// Returns the next sibling node.
/// ///
struct _cef_domnode_t*(CEF_CALLBACK* get_next_sibling)( struct _cef_domnode_t*(CEF_CALLBACK* get_next_sibling)(
struct _cef_domnode_t* self); struct _cef_domnode_t* self);
/// ///
// Returns true (1) if this node has child nodes. /// Returns true (1) if this node has child nodes.
/// ///
int(CEF_CALLBACK* has_children)(struct _cef_domnode_t* self); int(CEF_CALLBACK* has_children)(struct _cef_domnode_t* self);
/// ///
// Return the first child node. /// Return the first child node.
/// ///
struct _cef_domnode_t*(CEF_CALLBACK* get_first_child)( struct _cef_domnode_t*(CEF_CALLBACK* get_first_child)(
struct _cef_domnode_t* self); struct _cef_domnode_t* self);
/// ///
// Returns the last child node. /// Returns the last child node.
/// ///
struct _cef_domnode_t*(CEF_CALLBACK* get_last_child)( struct _cef_domnode_t*(CEF_CALLBACK* get_last_child)(
struct _cef_domnode_t* self); struct _cef_domnode_t* self);
// The following functions are valid only for element nodes.
/// ///
// Returns the tag name of this element. /// Returns the tag name of this element.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_element_tag_name)( cef_string_userfree_t(CEF_CALLBACK* get_element_tag_name)(
struct _cef_domnode_t* self); struct _cef_domnode_t* self);
/// ///
// Returns true (1) if this element has attributes. /// Returns true (1) if this element has attributes.
/// ///
int(CEF_CALLBACK* has_element_attributes)(struct _cef_domnode_t* self); int(CEF_CALLBACK* has_element_attributes)(struct _cef_domnode_t* self);
/// ///
// Returns true (1) if this element has an attribute named |attrName|. /// Returns true (1) if this element has an attribute named |attrName|.
/// ///
int(CEF_CALLBACK* has_element_attribute)(struct _cef_domnode_t* self, int(CEF_CALLBACK* has_element_attribute)(struct _cef_domnode_t* self,
const cef_string_t* attrName); const cef_string_t* attrName);
/// ///
// Returns the element attribute named |attrName|. /// Returns the element attribute named |attrName|.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_element_attribute)( cef_string_userfree_t(CEF_CALLBACK* get_element_attribute)(
@ -314,29 +312,29 @@ typedef struct _cef_domnode_t {
const cef_string_t* attrName); const cef_string_t* attrName);
/// ///
// Returns a map of all element attributes. /// Returns a map of all element attributes.
/// ///
void(CEF_CALLBACK* get_element_attributes)(struct _cef_domnode_t* self, void(CEF_CALLBACK* get_element_attributes)(struct _cef_domnode_t* self,
cef_string_map_t attrMap); cef_string_map_t attrMap);
/// ///
// Set the value for the element attribute named |attrName|. Returns true (1) /// Set the value for the element attribute named |attrName|. Returns true (1)
// on success. /// on success.
/// ///
int(CEF_CALLBACK* set_element_attribute)(struct _cef_domnode_t* self, int(CEF_CALLBACK* set_element_attribute)(struct _cef_domnode_t* self,
const cef_string_t* attrName, const cef_string_t* attrName,
const cef_string_t* value); const cef_string_t* value);
/// ///
// Returns the inner text of the element. /// Returns the inner text of the element.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_element_inner_text)( cef_string_userfree_t(CEF_CALLBACK* get_element_inner_text)(
struct _cef_domnode_t* self); struct _cef_domnode_t* self);
/// ///
// Returns the bounds of the element in device pixels. Use /// Returns the bounds of the element in device pixels. Use
// "window.devicePixelRatio" to convert to/from CSS pixels. /// "window.devicePixelRatio" to convert to/from CSS pixels.
/// ///
cef_rect_t(CEF_CALLBACK* get_element_bounds)(struct _cef_domnode_t* self); cef_rect_t(CEF_CALLBACK* get_element_bounds)(struct _cef_domnode_t* self);
} cef_domnode_t; } cef_domnode_t;

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=33862915eb4156a70794a346a090154c468763e2$ // $hash=aff139899b4b8b769fd0e506d8a46e434f924eee$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_DOWNLOAD_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_DOWNLOAD_HANDLER_CAPI_H_
@ -49,19 +49,19 @@ extern "C" {
#endif #endif
/// ///
// Callback structure used to asynchronously continue a download. /// Callback structure used to asynchronously continue a download.
/// ///
typedef struct _cef_before_download_callback_t { typedef struct _cef_before_download_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Call to continue the download. Set |download_path| to the full file path /// Call to continue the download. Set |download_path| to the full file path
// for the download including the file name or leave blank to use the /// for the download including the file name or leave blank to use the
// suggested name and the default temp directory. Set |show_dialog| to true /// suggested name and the default temp directory. Set |show_dialog| to true
// (1) if you do wish to show the default "Save As" dialog. /// (1) if you do wish to show the default "Save As" dialog.
/// ///
void(CEF_CALLBACK* cont)(struct _cef_before_download_callback_t* self, void(CEF_CALLBACK* cont)(struct _cef_before_download_callback_t* self,
const cef_string_t* download_path, const cef_string_t* download_path,
@ -69,46 +69,46 @@ typedef struct _cef_before_download_callback_t {
} cef_before_download_callback_t; } cef_before_download_callback_t;
/// ///
// Callback structure used to asynchronously cancel a download. /// Callback structure used to asynchronously cancel a download.
/// ///
typedef struct _cef_download_item_callback_t { typedef struct _cef_download_item_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Call to cancel the download. /// Call to cancel the download.
/// ///
void(CEF_CALLBACK* cancel)(struct _cef_download_item_callback_t* self); void(CEF_CALLBACK* cancel)(struct _cef_download_item_callback_t* self);
/// ///
// Call to pause the download. /// Call to pause the download.
/// ///
void(CEF_CALLBACK* pause)(struct _cef_download_item_callback_t* self); void(CEF_CALLBACK* pause)(struct _cef_download_item_callback_t* self);
/// ///
// Call to resume the download. /// Call to resume the download.
/// ///
void(CEF_CALLBACK* resume)(struct _cef_download_item_callback_t* self); void(CEF_CALLBACK* resume)(struct _cef_download_item_callback_t* self);
} cef_download_item_callback_t; } cef_download_item_callback_t;
/// ///
// Structure used to handle file downloads. The functions of this structure will /// Structure used to handle file downloads. The functions of this structure
// called on the browser process UI thread. /// will called on the browser process UI thread.
/// ///
typedef struct _cef_download_handler_t { typedef struct _cef_download_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called before a download begins in response to a user-initiated action /// Called before a download begins in response to a user-initiated action
// (e.g. alt + link click or link click that returns a `Content-Disposition: /// (e.g. alt + link click or link click that returns a `Content-Disposition:
// attachment` response from the server). |url| is the target download URL and /// attachment` response from the server). |url| is the target download URL
// |request_function| is the target function (GET, POST, etc). Return true (1) /// and |request_function| is the target function (GET, POST, etc). Return
// to proceed with the download or false (0) to cancel the download. /// true (1) to proceed with the download or false (0) to cancel the download.
/// ///
int(CEF_CALLBACK* can_download)(struct _cef_download_handler_t* self, int(CEF_CALLBACK* can_download)(struct _cef_download_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -116,11 +116,11 @@ typedef struct _cef_download_handler_t {
const cef_string_t* request_method); const cef_string_t* request_method);
/// ///
// Called before a download begins. |suggested_name| is the suggested name for /// Called before a download begins. |suggested_name| is the suggested name
// the download file. By default the download will be canceled. Execute /// for the download file. By default the download will be canceled. Execute
// |callback| either asynchronously or in this function to continue the /// |callback| either asynchronously or in this function to continue the
// download if desired. Do not keep a reference to |download_item| outside of /// download if desired. Do not keep a reference to |download_item| outside of
// this function. /// this function.
/// ///
void(CEF_CALLBACK* on_before_download)( void(CEF_CALLBACK* on_before_download)(
struct _cef_download_handler_t* self, struct _cef_download_handler_t* self,
@ -130,11 +130,11 @@ typedef struct _cef_download_handler_t {
struct _cef_before_download_callback_t* callback); struct _cef_before_download_callback_t* callback);
/// ///
// Called when a download's status or progress information has been updated. /// Called when a download's status or progress information has been updated.
// This may be called multiple times before and after on_before_download(). /// This may be called multiple times before and after on_before_download().
// Execute |callback| either asynchronously or in this function to cancel the /// Execute |callback| either asynchronously or in this function to cancel the
// download if desired. Do not keep a reference to |download_item| outside of /// download if desired. Do not keep a reference to |download_item| outside of
// this function. /// this function.
/// ///
void(CEF_CALLBACK* on_download_updated)( void(CEF_CALLBACK* on_download_updated)(
struct _cef_download_handler_t* self, struct _cef_download_handler_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=1c1dd82539e356f15be95b66d824740075c48e4f$ // $hash=a218058d7ceb842c9ea0cf0c252f9787de6562e7$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_DOWNLOAD_ITEM_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_DOWNLOAD_ITEM_CAPI_H_
@ -47,109 +47,109 @@ extern "C" {
#endif #endif
/// ///
// Structure used to represent a download item. /// Structure used to represent a download item.
/// ///
typedef struct _cef_download_item_t { typedef struct _cef_download_item_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is valid. Do not call any other functions /// Returns true (1) if this object is valid. Do not call any other functions
// if this function returns false (0). /// if this function returns false (0).
/// ///
int(CEF_CALLBACK* is_valid)(struct _cef_download_item_t* self); int(CEF_CALLBACK* is_valid)(struct _cef_download_item_t* self);
/// ///
// Returns true (1) if the download is in progress. /// Returns true (1) if the download is in progress.
/// ///
int(CEF_CALLBACK* is_in_progress)(struct _cef_download_item_t* self); int(CEF_CALLBACK* is_in_progress)(struct _cef_download_item_t* self);
/// ///
// Returns true (1) if the download is complete. /// Returns true (1) if the download is complete.
/// ///
int(CEF_CALLBACK* is_complete)(struct _cef_download_item_t* self); int(CEF_CALLBACK* is_complete)(struct _cef_download_item_t* self);
/// ///
// Returns true (1) if the download has been canceled or interrupted. /// Returns true (1) if the download has been canceled or interrupted.
/// ///
int(CEF_CALLBACK* is_canceled)(struct _cef_download_item_t* self); int(CEF_CALLBACK* is_canceled)(struct _cef_download_item_t* self);
/// ///
// Returns a simple speed estimate in bytes/s. /// Returns a simple speed estimate in bytes/s.
/// ///
int64(CEF_CALLBACK* get_current_speed)(struct _cef_download_item_t* self); int64(CEF_CALLBACK* get_current_speed)(struct _cef_download_item_t* self);
/// ///
// Returns the rough percent complete or -1 if the receive total size is /// Returns the rough percent complete or -1 if the receive total size is
// unknown. /// unknown.
/// ///
int(CEF_CALLBACK* get_percent_complete)(struct _cef_download_item_t* self); int(CEF_CALLBACK* get_percent_complete)(struct _cef_download_item_t* self);
/// ///
// Returns the total number of bytes. /// Returns the total number of bytes.
/// ///
int64(CEF_CALLBACK* get_total_bytes)(struct _cef_download_item_t* self); int64(CEF_CALLBACK* get_total_bytes)(struct _cef_download_item_t* self);
/// ///
// Returns the number of received bytes. /// Returns the number of received bytes.
/// ///
int64(CEF_CALLBACK* get_received_bytes)(struct _cef_download_item_t* self); int64(CEF_CALLBACK* get_received_bytes)(struct _cef_download_item_t* self);
/// ///
// Returns the time that the download started. /// Returns the time that the download started.
/// ///
cef_basetime_t(CEF_CALLBACK* get_start_time)( cef_basetime_t(CEF_CALLBACK* get_start_time)(
struct _cef_download_item_t* self); struct _cef_download_item_t* self);
/// ///
// Returns the time that the download ended. /// Returns the time that the download ended.
/// ///
cef_basetime_t(CEF_CALLBACK* get_end_time)(struct _cef_download_item_t* self); cef_basetime_t(CEF_CALLBACK* get_end_time)(struct _cef_download_item_t* self);
/// ///
// Returns the full path to the downloaded or downloading file. /// Returns the full path to the downloaded or downloading file.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_full_path)( cef_string_userfree_t(CEF_CALLBACK* get_full_path)(
struct _cef_download_item_t* self); struct _cef_download_item_t* self);
/// ///
// Returns the unique identifier for this download. /// Returns the unique identifier for this download.
/// ///
uint32(CEF_CALLBACK* get_id)(struct _cef_download_item_t* self); uint32(CEF_CALLBACK* get_id)(struct _cef_download_item_t* self);
/// ///
// Returns the URL. /// Returns the URL.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_url)( cef_string_userfree_t(CEF_CALLBACK* get_url)(
struct _cef_download_item_t* self); struct _cef_download_item_t* self);
/// ///
// Returns the original URL before any redirections. /// Returns the original URL before any redirections.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_original_url)( cef_string_userfree_t(CEF_CALLBACK* get_original_url)(
struct _cef_download_item_t* self); struct _cef_download_item_t* self);
/// ///
// Returns the suggested file name. /// Returns the suggested file name.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_suggested_file_name)( cef_string_userfree_t(CEF_CALLBACK* get_suggested_file_name)(
struct _cef_download_item_t* self); struct _cef_download_item_t* self);
/// ///
// Returns the content disposition. /// Returns the content disposition.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_content_disposition)( cef_string_userfree_t(CEF_CALLBACK* get_content_disposition)(
struct _cef_download_item_t* self); struct _cef_download_item_t* self);
/// ///
// Returns the mime type. /// Returns the mime type.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_mime_type)( cef_string_userfree_t(CEF_CALLBACK* get_mime_type)(

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=c99e9efb74fea2a2a99b25a694c59256f59238ab$ // $hash=9e8375de3d30eb7e4f67488da3568d19848eb038$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_DRAG_DATA_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_DRAG_DATA_CAPI_H_
@ -49,180 +49,180 @@ extern "C" {
#endif #endif
/// ///
// Structure used to represent drag data. The functions of this structure may be /// Structure used to represent drag data. The functions of this structure may
// called on any thread. /// be called on any thread.
/// ///
typedef struct _cef_drag_data_t { typedef struct _cef_drag_data_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns a copy of the current object. /// Returns a copy of the current object.
/// ///
struct _cef_drag_data_t*(CEF_CALLBACK* clone)(struct _cef_drag_data_t* self); struct _cef_drag_data_t*(CEF_CALLBACK* clone)(struct _cef_drag_data_t* self);
/// ///
// Returns true (1) if this object is read-only. /// Returns true (1) if this object is read-only.
/// ///
int(CEF_CALLBACK* is_read_only)(struct _cef_drag_data_t* self); int(CEF_CALLBACK* is_read_only)(struct _cef_drag_data_t* self);
/// ///
// Returns true (1) if the drag data is a link. /// Returns true (1) if the drag data is a link.
/// ///
int(CEF_CALLBACK* is_link)(struct _cef_drag_data_t* self); int(CEF_CALLBACK* is_link)(struct _cef_drag_data_t* self);
/// ///
// Returns true (1) if the drag data is a text or html fragment. /// Returns true (1) if the drag data is a text or html fragment.
/// ///
int(CEF_CALLBACK* is_fragment)(struct _cef_drag_data_t* self); int(CEF_CALLBACK* is_fragment)(struct _cef_drag_data_t* self);
/// ///
// Returns true (1) if the drag data is a file. /// Returns true (1) if the drag data is a file.
/// ///
int(CEF_CALLBACK* is_file)(struct _cef_drag_data_t* self); int(CEF_CALLBACK* is_file)(struct _cef_drag_data_t* self);
/// ///
// Return the link URL that is being dragged. /// Return the link URL that is being dragged.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_link_url)( cef_string_userfree_t(CEF_CALLBACK* get_link_url)(
struct _cef_drag_data_t* self); struct _cef_drag_data_t* self);
/// ///
// Return the title associated with the link being dragged. /// Return the title associated with the link being dragged.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_link_title)( cef_string_userfree_t(CEF_CALLBACK* get_link_title)(
struct _cef_drag_data_t* self); struct _cef_drag_data_t* self);
/// ///
// Return the metadata, if any, associated with the link being dragged. /// Return the metadata, if any, associated with the link being dragged.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_link_metadata)( cef_string_userfree_t(CEF_CALLBACK* get_link_metadata)(
struct _cef_drag_data_t* self); struct _cef_drag_data_t* self);
/// ///
// Return the plain text fragment that is being dragged. /// Return the plain text fragment that is being dragged.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_fragment_text)( cef_string_userfree_t(CEF_CALLBACK* get_fragment_text)(
struct _cef_drag_data_t* self); struct _cef_drag_data_t* self);
/// ///
// Return the text/html fragment that is being dragged. /// Return the text/html fragment that is being dragged.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_fragment_html)( cef_string_userfree_t(CEF_CALLBACK* get_fragment_html)(
struct _cef_drag_data_t* self); struct _cef_drag_data_t* self);
/// ///
// Return the base URL that the fragment came from. This value is used for /// Return the base URL that the fragment came from. This value is used for
// resolving relative URLs and may be NULL. /// resolving relative URLs and may be NULL.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_fragment_base_url)( cef_string_userfree_t(CEF_CALLBACK* get_fragment_base_url)(
struct _cef_drag_data_t* self); struct _cef_drag_data_t* self);
/// ///
// Return the name of the file being dragged out of the browser window. /// Return the name of the file being dragged out of the browser window.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_file_name)( cef_string_userfree_t(CEF_CALLBACK* get_file_name)(
struct _cef_drag_data_t* self); struct _cef_drag_data_t* self);
/// ///
// Write the contents of the file being dragged out of the web view into /// Write the contents of the file being dragged out of the web view into
// |writer|. Returns the number of bytes sent to |writer|. If |writer| is NULL /// |writer|. Returns the number of bytes sent to |writer|. If |writer| is
// this function will return the size of the file contents in bytes. Call /// NULL this function will return the size of the file contents in bytes.
// get_file_name() to get a suggested name for the file. /// Call get_file_name() to get a suggested name for the file.
/// ///
size_t(CEF_CALLBACK* get_file_contents)(struct _cef_drag_data_t* self, size_t(CEF_CALLBACK* get_file_contents)(struct _cef_drag_data_t* self,
struct _cef_stream_writer_t* writer); struct _cef_stream_writer_t* writer);
/// ///
// Retrieve the list of file names that are being dragged into the browser /// Retrieve the list of file names that are being dragged into the browser
// window. /// window.
/// ///
int(CEF_CALLBACK* get_file_names)(struct _cef_drag_data_t* self, int(CEF_CALLBACK* get_file_names)(struct _cef_drag_data_t* self,
cef_string_list_t names); cef_string_list_t names);
/// ///
// Set the link URL that is being dragged. /// Set the link URL that is being dragged.
/// ///
void(CEF_CALLBACK* set_link_url)(struct _cef_drag_data_t* self, void(CEF_CALLBACK* set_link_url)(struct _cef_drag_data_t* self,
const cef_string_t* url); const cef_string_t* url);
/// ///
// Set the title associated with the link being dragged. /// Set the title associated with the link being dragged.
/// ///
void(CEF_CALLBACK* set_link_title)(struct _cef_drag_data_t* self, void(CEF_CALLBACK* set_link_title)(struct _cef_drag_data_t* self,
const cef_string_t* title); const cef_string_t* title);
/// ///
// Set the metadata associated with the link being dragged. /// Set the metadata associated with the link being dragged.
/// ///
void(CEF_CALLBACK* set_link_metadata)(struct _cef_drag_data_t* self, void(CEF_CALLBACK* set_link_metadata)(struct _cef_drag_data_t* self,
const cef_string_t* data); const cef_string_t* data);
/// ///
// Set the plain text fragment that is being dragged. /// Set the plain text fragment that is being dragged.
/// ///
void(CEF_CALLBACK* set_fragment_text)(struct _cef_drag_data_t* self, void(CEF_CALLBACK* set_fragment_text)(struct _cef_drag_data_t* self,
const cef_string_t* text); const cef_string_t* text);
/// ///
// Set the text/html fragment that is being dragged. /// Set the text/html fragment that is being dragged.
/// ///
void(CEF_CALLBACK* set_fragment_html)(struct _cef_drag_data_t* self, void(CEF_CALLBACK* set_fragment_html)(struct _cef_drag_data_t* self,
const cef_string_t* html); const cef_string_t* html);
/// ///
// Set the base URL that the fragment came from. /// Set the base URL that the fragment came from.
/// ///
void(CEF_CALLBACK* set_fragment_base_url)(struct _cef_drag_data_t* self, void(CEF_CALLBACK* set_fragment_base_url)(struct _cef_drag_data_t* self,
const cef_string_t* base_url); const cef_string_t* base_url);
/// ///
// Reset the file contents. You should do this before calling /// Reset the file contents. You should do this before calling
// cef_browser_host_t::DragTargetDragEnter as the web view does not allow us /// cef_browser_host_t::DragTargetDragEnter as the web view does not allow us
// to drag in this kind of data. /// to drag in this kind of data.
/// ///
void(CEF_CALLBACK* reset_file_contents)(struct _cef_drag_data_t* self); void(CEF_CALLBACK* reset_file_contents)(struct _cef_drag_data_t* self);
/// ///
// Add a file that is being dragged into the webview. /// Add a file that is being dragged into the webview.
/// ///
void(CEF_CALLBACK* add_file)(struct _cef_drag_data_t* self, void(CEF_CALLBACK* add_file)(struct _cef_drag_data_t* self,
const cef_string_t* path, const cef_string_t* path,
const cef_string_t* display_name); const cef_string_t* display_name);
/// ///
// Clear list of filenames. /// Clear list of filenames.
/// ///
void(CEF_CALLBACK* clear_filenames)(struct _cef_drag_data_t* self); void(CEF_CALLBACK* clear_filenames)(struct _cef_drag_data_t* self);
/// ///
// Get the image representation of drag data. May return NULL if no image /// Get the image representation of drag data. May return NULL if no image
// representation is available. /// representation is available.
/// ///
struct _cef_image_t*(CEF_CALLBACK* get_image)(struct _cef_drag_data_t* self); struct _cef_image_t*(CEF_CALLBACK* get_image)(struct _cef_drag_data_t* self);
/// ///
// Get the image hotspot (drag start location relative to image dimensions). /// Get the image hotspot (drag start location relative to image dimensions).
/// ///
cef_point_t(CEF_CALLBACK* get_image_hotspot)(struct _cef_drag_data_t* self); cef_point_t(CEF_CALLBACK* get_image_hotspot)(struct _cef_drag_data_t* self);
/// ///
// Returns true (1) if an image representation of drag data is available. /// Returns true (1) if an image representation of drag data is available.
/// ///
int(CEF_CALLBACK* has_image)(struct _cef_drag_data_t* self); int(CEF_CALLBACK* has_image)(struct _cef_drag_data_t* self);
} cef_drag_data_t; } cef_drag_data_t;
/// ///
// Create a new cef_drag_data_t object. /// Create a new cef_drag_data_t object.
/// ///
CEF_EXPORT cef_drag_data_t* cef_drag_data_create(void); CEF_EXPORT cef_drag_data_t* cef_drag_data_create(void);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=5b2051c42c1d4c41b85ca823d34b26bfa5de6777$ // $hash=ec450acb2c3cc4d0e69b7da725387d5c1049773b$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_DRAG_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_DRAG_HANDLER_CAPI_H_
@ -50,20 +50,20 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to handle events related to dragging. The functions /// Implement this structure to handle events related to dragging. The functions
// of this structure will be called on the UI thread. /// of this structure will be called on the UI thread.
/// ///
typedef struct _cef_drag_handler_t { typedef struct _cef_drag_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called when an external drag event enters the browser window. |dragData| /// Called when an external drag event enters the browser window. |dragData|
// contains the drag event data and |mask| represents the type of drag /// contains the drag event data and |mask| represents the type of drag
// operation. Return false (0) for default drag handling behavior or true (1) /// operation. Return false (0) for default drag handling behavior or true (1)
// to cancel the drag event. /// to cancel the drag event.
/// ///
int(CEF_CALLBACK* on_drag_enter)(struct _cef_drag_handler_t* self, int(CEF_CALLBACK* on_drag_enter)(struct _cef_drag_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -71,11 +71,11 @@ typedef struct _cef_drag_handler_t {
cef_drag_operations_mask_t mask); cef_drag_operations_mask_t mask);
/// ///
// Called whenever draggable regions for the browser window change. These can /// Called whenever draggable regions for the browser window change. These can
// be specified using the '-webkit-app-region: drag/no-drag' CSS-property. If /// be specified using the '-webkit-app-region: drag/no-drag' CSS-property. If
// draggable regions are never defined in a document this function will also /// draggable regions are never defined in a document this function will also
// never be called. If the last draggable region is removed from a document /// never be called. If the last draggable region is removed from a document
// this function will be called with an NULL vector. /// this function will be called with an NULL vector.
/// ///
void(CEF_CALLBACK* on_draggable_regions_changed)( void(CEF_CALLBACK* on_draggable_regions_changed)(
struct _cef_drag_handler_t* self, struct _cef_drag_handler_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=fcfe34c1517ebdb3f00c1f737b91361e771b820d$ // $hash=b16b1c47d26e911d360159e5535743622a411c31$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_EXTENSION_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_EXTENSION_CAPI_H_
@ -51,74 +51,74 @@ struct _cef_extension_handler_t;
struct _cef_request_context_t; struct _cef_request_context_t;
/// ///
// Object representing an extension. Methods may be called on any thread unless /// Object representing an extension. Methods may be called on any thread unless
// otherwise indicated. /// otherwise indicated.
/// ///
typedef struct _cef_extension_t { typedef struct _cef_extension_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns the unique extension identifier. This is calculated based on the /// Returns the unique extension identifier. This is calculated based on the
// extension public key, if available, or on the extension path. See /// extension public key, if available, or on the extension path. See
// https://developer.chrome.com/extensions/manifest/key for details. /// https://developer.chrome.com/extensions/manifest/key for details.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_identifier)( cef_string_userfree_t(CEF_CALLBACK* get_identifier)(
struct _cef_extension_t* self); struct _cef_extension_t* self);
/// ///
// Returns the absolute path to the extension directory on disk. This value /// Returns the absolute path to the extension directory on disk. This value
// will be prefixed with PK_DIR_RESOURCES if a relative path was passed to /// will be prefixed with PK_DIR_RESOURCES if a relative path was passed to
// cef_request_context_t::LoadExtension. /// cef_request_context_t::LoadExtension.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_path)(struct _cef_extension_t* self); cef_string_userfree_t(CEF_CALLBACK* get_path)(struct _cef_extension_t* self);
/// ///
// Returns the extension manifest contents as a cef_dictionary_value_t object. /// Returns the extension manifest contents as a cef_dictionary_value_t
// See https://developer.chrome.com/extensions/manifest for details. /// object. See https://developer.chrome.com/extensions/manifest for details.
/// ///
struct _cef_dictionary_value_t*(CEF_CALLBACK* get_manifest)( struct _cef_dictionary_value_t*(CEF_CALLBACK* get_manifest)(
struct _cef_extension_t* self); struct _cef_extension_t* self);
/// ///
// Returns true (1) if this object is the same extension as |that| object. /// Returns true (1) if this object is the same extension as |that| object.
// Extensions are considered the same if identifier, path and loader context /// Extensions are considered the same if identifier, path and loader context
// match. /// match.
/// ///
int(CEF_CALLBACK* is_same)(struct _cef_extension_t* self, int(CEF_CALLBACK* is_same)(struct _cef_extension_t* self,
struct _cef_extension_t* that); struct _cef_extension_t* that);
/// ///
// Returns the handler for this extension. Will return NULL for internal /// Returns the handler for this extension. Will return NULL for internal
// extensions or if no handler was passed to /// extensions or if no handler was passed to
// cef_request_context_t::LoadExtension. /// cef_request_context_t::LoadExtension.
/// ///
struct _cef_extension_handler_t*(CEF_CALLBACK* get_handler)( struct _cef_extension_handler_t*(CEF_CALLBACK* get_handler)(
struct _cef_extension_t* self); struct _cef_extension_t* self);
/// ///
// Returns the request context that loaded this extension. Will return NULL /// Returns the request context that loaded this extension. Will return NULL
// for internal extensions or if the extension has been unloaded. See the /// for internal extensions or if the extension has been unloaded. See the
// cef_request_context_t::LoadExtension documentation for more information /// cef_request_context_t::LoadExtension documentation for more information
// about loader contexts. Must be called on the browser process UI thread. /// about loader contexts. Must be called on the browser process UI thread.
/// ///
struct _cef_request_context_t*(CEF_CALLBACK* get_loader_context)( struct _cef_request_context_t*(CEF_CALLBACK* get_loader_context)(
struct _cef_extension_t* self); struct _cef_extension_t* self);
/// ///
// Returns true (1) if this extension is currently loaded. Must be called on /// Returns true (1) if this extension is currently loaded. Must be called on
// the browser process UI thread. /// the browser process UI thread.
/// ///
int(CEF_CALLBACK* is_loaded)(struct _cef_extension_t* self); int(CEF_CALLBACK* is_loaded)(struct _cef_extension_t* self);
/// ///
// Unload this extension if it is not an internal extension and is currently /// Unload this extension if it is not an internal extension and is currently
// loaded. Will result in a call to /// loaded. Will result in a call to
// cef_extension_handler_t::OnExtensionUnloaded on success. /// cef_extension_handler_t::OnExtensionUnloaded on success.
/// ///
void(CEF_CALLBACK* unload)(struct _cef_extension_t* self); void(CEF_CALLBACK* unload)(struct _cef_extension_t* self);
} cef_extension_t; } cef_extension_t;

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=768e2436e54cceb2675ddd03ebdc61b5c0785bdc$ // $hash=ba961ade334c82e53213e7e8ac848adc2a7b533a$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_EXTENSION_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_EXTENSION_HANDLER_CAPI_H_
@ -52,75 +52,76 @@ extern "C" {
struct _cef_client_t; struct _cef_client_t;
/// ///
// Callback structure used for asynchronous continuation of /// Callback structure used for asynchronous continuation of
// cef_extension_handler_t::GetExtensionResource. /// cef_extension_handler_t::GetExtensionResource.
/// ///
typedef struct _cef_get_extension_resource_callback_t { typedef struct _cef_get_extension_resource_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Continue the request. Read the resource contents from |stream|. /// Continue the request. Read the resource contents from |stream|.
/// ///
void(CEF_CALLBACK* cont)(struct _cef_get_extension_resource_callback_t* self, void(CEF_CALLBACK* cont)(struct _cef_get_extension_resource_callback_t* self,
struct _cef_stream_reader_t* stream); struct _cef_stream_reader_t* stream);
/// ///
// Cancel the request. /// Cancel the request.
/// ///
void(CEF_CALLBACK* cancel)( void(CEF_CALLBACK* cancel)(
struct _cef_get_extension_resource_callback_t* self); struct _cef_get_extension_resource_callback_t* self);
} cef_get_extension_resource_callback_t; } cef_get_extension_resource_callback_t;
/// ///
// Implement this structure to handle events related to browser extensions. The /// Implement this structure to handle events related to browser extensions. The
// functions of this structure will be called on the UI thread. See /// functions of this structure will be called on the UI thread. See
// cef_request_context_t::LoadExtension for information about extension loading. /// cef_request_context_t::LoadExtension for information about extension
/// loading.
/// ///
typedef struct _cef_extension_handler_t { typedef struct _cef_extension_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called if the cef_request_context_t::LoadExtension request fails. |result| /// Called if the cef_request_context_t::LoadExtension request fails. |result|
// will be the error code. /// will be the error code.
/// ///
void(CEF_CALLBACK* on_extension_load_failed)( void(CEF_CALLBACK* on_extension_load_failed)(
struct _cef_extension_handler_t* self, struct _cef_extension_handler_t* self,
cef_errorcode_t result); cef_errorcode_t result);
/// ///
// Called if the cef_request_context_t::LoadExtension request succeeds. /// Called if the cef_request_context_t::LoadExtension request succeeds.
// |extension| is the loaded extension. /// |extension| is the loaded extension.
/// ///
void(CEF_CALLBACK* on_extension_loaded)(struct _cef_extension_handler_t* self, void(CEF_CALLBACK* on_extension_loaded)(struct _cef_extension_handler_t* self,
struct _cef_extension_t* extension); struct _cef_extension_t* extension);
/// ///
// Called after the cef_extension_t::Unload request has completed. /// Called after the cef_extension_t::Unload request has completed.
/// ///
void(CEF_CALLBACK* on_extension_unloaded)( void(CEF_CALLBACK* on_extension_unloaded)(
struct _cef_extension_handler_t* self, struct _cef_extension_handler_t* self,
struct _cef_extension_t* extension); struct _cef_extension_t* extension);
/// ///
// Called when an extension needs a browser to host a background script /// Called when an extension needs a browser to host a background script
// specified via the "background" manifest key. The browser will have no /// specified via the "background" manifest key. The browser will have no
// visible window and cannot be displayed. |extension| is the extension that /// visible window and cannot be displayed. |extension| is the extension that
// is loading the background script. |url| is an internally generated /// is loading the background script. |url| is an internally generated
// reference to an HTML page that will be used to load the background script /// reference to an HTML page that will be used to load the background script
// via a <script> src attribute. To allow creation of the browser optionally /// via a "<script>" src attribute. To allow creation of the browser
// modify |client| and |settings| and return false (0). To cancel creation of /// optionally modify |client| and |settings| and return false (0). To cancel
// the browser (and consequently cancel load of the background script) return /// creation of the browser (and consequently cancel load of the background
// true (1). Successful creation will be indicated by a call to /// script) return true (1). Successful creation will be indicated by a call
// cef_life_span_handler_t::OnAfterCreated, and /// to cef_life_span_handler_t::OnAfterCreated, and
// cef_browser_host_t::IsBackgroundHost will return true (1) for the resulting /// cef_browser_host_t::IsBackgroundHost will return true (1) for the
// browser. See https://developer.chrome.com/extensions/event_pages for more /// resulting browser. See https://developer.chrome.com/extensions/event_pages
// information about extension background script usage. /// for more information about extension background script usage.
/// ///
int(CEF_CALLBACK* on_before_background_browser)( int(CEF_CALLBACK* on_before_background_browser)(
struct _cef_extension_handler_t* self, struct _cef_extension_handler_t* self,
@ -130,19 +131,19 @@ typedef struct _cef_extension_handler_t {
struct _cef_browser_settings_t* settings); struct _cef_browser_settings_t* settings);
/// ///
// Called when an extension API (e.g. chrome.tabs.create) requests creation of /// Called when an extension API (e.g. chrome.tabs.create) requests creation
// a new browser. |extension| and |browser| are the source of the API call. /// of a new browser. |extension| and |browser| are the source of the API
// |active_browser| may optionally be specified via the windowId property or /// call. |active_browser| may optionally be specified via the windowId
// returned via the get_active_browser() callback and provides the default /// property or returned via the get_active_browser() callback and provides
// |client| and |settings| values for the new browser. |index| is the position /// the default |client| and |settings| values for the new browser. |index| is
// value optionally specified via the index property. |url| is the URL that /// the position value optionally specified via the index property. |url| is
// will be loaded in the browser. |active| is true (1) if the new browser /// the URL that will be loaded in the browser. |active| is true (1) if the
// should be active when opened. To allow creation of the browser optionally /// new browser should be active when opened. To allow creation of the
// modify |windowInfo|, |client| and |settings| and return false (0). To /// browser optionally modify |windowInfo|, |client| and |settings| and return
// cancel creation of the browser return true (1). Successful creation will be /// false (0). To cancel creation of the browser return true (1). Successful
// indicated by a call to cef_life_span_handler_t::OnAfterCreated. Any /// creation will be indicated by a call to
// modifications to |windowInfo| will be ignored if |active_browser| is /// cef_life_span_handler_t::OnAfterCreated. Any modifications to |windowInfo|
// wrapped in a cef_browser_view_t. /// will be ignored if |active_browser| is wrapped in a cef_browser_view_t.
/// ///
int(CEF_CALLBACK* on_before_browser)( int(CEF_CALLBACK* on_before_browser)(
struct _cef_extension_handler_t* self, struct _cef_extension_handler_t* self,
@ -157,13 +158,13 @@ typedef struct _cef_extension_handler_t {
struct _cef_browser_settings_t* settings); struct _cef_browser_settings_t* settings);
/// ///
// Called when no tabId is specified to an extension API call that accepts a /// Called when no tabId is specified to an extension API call that accepts a
// tabId parameter (e.g. chrome.tabs.*). |extension| and |browser| are the /// tabId parameter (e.g. chrome.tabs.*). |extension| and |browser| are the
// source of the API call. Return the browser that will be acted on by the API /// source of the API call. Return the browser that will be acted on by the
// call or return NULL to act on |browser|. The returned browser must share /// API call or return NULL to act on |browser|. The returned browser must
// the same cef_request_context_t as |browser|. Incognito browsers should not /// share the same cef_request_context_t as |browser|. Incognito browsers
// be considered unless the source extension has incognito access enabled, in /// should not be considered unless the source extension has incognito access
// which case |include_incognito| will be true (1). /// enabled, in which case |include_incognito| will be true (1).
/// ///
struct _cef_browser_t*(CEF_CALLBACK* get_active_browser)( struct _cef_browser_t*(CEF_CALLBACK* get_active_browser)(
struct _cef_extension_handler_t* self, struct _cef_extension_handler_t* self,
@ -172,12 +173,12 @@ typedef struct _cef_extension_handler_t {
int include_incognito); int include_incognito);
/// ///
// Called when the tabId associated with |target_browser| is specified to an /// Called when the tabId associated with |target_browser| is specified to an
// extension API call that accepts a tabId parameter (e.g. chrome.tabs.*). /// extension API call that accepts a tabId parameter (e.g. chrome.tabs.*).
// |extension| and |browser| are the source of the API call. Return true (1) /// |extension| and |browser| are the source of the API call. Return true (1)
// to allow access of false (0) to deny access. Access to incognito browsers /// to allow access of false (0) to deny access. Access to incognito browsers
// should not be allowed unless the source extension has incognito access /// should not be allowed unless the source extension has incognito access
// enabled, in which case |include_incognito| will be true (1). /// enabled, in which case |include_incognito| will be true (1).
/// ///
int(CEF_CALLBACK* can_access_browser)(struct _cef_extension_handler_t* self, int(CEF_CALLBACK* can_access_browser)(struct _cef_extension_handler_t* self,
struct _cef_extension_t* extension, struct _cef_extension_t* extension,
@ -186,14 +187,15 @@ typedef struct _cef_extension_handler_t {
struct _cef_browser_t* target_browser); struct _cef_browser_t* target_browser);
/// ///
// Called to retrieve an extension resource that would normally be loaded from /// Called to retrieve an extension resource that would normally be loaded
// disk (e.g. if a file parameter is specified to chrome.tabs.executeScript). /// from disk (e.g. if a file parameter is specified to
// |extension| and |browser| are the source of the resource request. |file| is /// chrome.tabs.executeScript). |extension| and |browser| are the source of
// the requested relative file path. To handle the resource request return /// the resource request. |file| is the requested relative file path. To
// true (1) and execute |callback| either synchronously or asynchronously. For /// handle the resource request return true (1) and execute |callback| either
// the default behavior which reads the resource from the extension directory /// synchronously or asynchronously. For the default behavior which reads the
// on disk return false (0). Localization substitutions will not be applied to /// resource from the extension directory on disk return false (0).
// resources handled via this function. /// Localization substitutions will not be applied to resources handled via
/// this function.
/// ///
int(CEF_CALLBACK* get_extension_resource)( int(CEF_CALLBACK* get_extension_resource)(
struct _cef_extension_handler_t* self, struct _cef_extension_handler_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=e76fa23e9682bf0865319d93e4009752ac8f854f$ // $hash=3e2e068a2be0a3b12653eea65a4bbe1c9cdb8c7f$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_FILE_UTIL_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_FILE_UTIL_CAPI_H_
@ -47,40 +47,40 @@ extern "C" {
#endif #endif
/// ///
// Creates a directory and all parent directories if they don't already exist. /// Creates a directory and all parent directories if they don't already exist.
// Returns true (1) on successful creation or if the directory already exists. /// Returns true (1) on successful creation or if the directory already exists.
// The directory is only readable by the current user. Calling this function on /// The directory is only readable by the current user. Calling this function on
// the browser process UI or IO threads is not allowed. /// the browser process UI or IO threads is not allowed.
/// ///
CEF_EXPORT int cef_create_directory(const cef_string_t* full_path); CEF_EXPORT int cef_create_directory(const cef_string_t* full_path);
/// ///
// Get the temporary directory provided by the system. /// Get the temporary directory provided by the system.
// ///
// WARNING: In general, you should use the temp directory variants below instead /// WARNING: In general, you should use the temp directory variants below
// of this function. Those variants will ensure that the proper permissions are /// instead of this function. Those variants will ensure that the proper
// set so that other users on the system can't edit them while they're open /// permissions are set so that other users on the system can't edit them while
// (which could lead to security issues). /// they're open (which could lead to security issues).
/// ///
CEF_EXPORT int cef_get_temp_directory(cef_string_t* temp_dir); CEF_EXPORT int cef_get_temp_directory(cef_string_t* temp_dir);
/// ///
// Creates a new directory. On Windows if |prefix| is provided the new directory /// Creates a new directory. On Windows if |prefix| is provided the new
// name is in the format of "prefixyyyy". Returns true (1) on success and sets /// directory name is in the format of "prefixyyyy". Returns true (1) on success
// |new_temp_path| to the full path of the directory that was created. The /// and sets |new_temp_path| to the full path of the directory that was created.
// directory is only readable by the current user. Calling this function on the /// The directory is only readable by the current user. Calling this function on
// browser process UI or IO threads is not allowed. /// the browser process UI or IO threads is not allowed.
/// ///
CEF_EXPORT int cef_create_new_temp_directory(const cef_string_t* prefix, CEF_EXPORT int cef_create_new_temp_directory(const cef_string_t* prefix,
cef_string_t* new_temp_path); cef_string_t* new_temp_path);
/// ///
// Creates a directory within another directory. Extra characters will be /// Creates a directory within another directory. Extra characters will be
// appended to |prefix| to ensure that the new directory does not have the same /// appended to |prefix| to ensure that the new directory does not have the same
// name as an existing directory. Returns true (1) on success and sets |new_dir| /// name as an existing directory. Returns true (1) on success and sets
// to the full path of the directory that was created. The directory is only /// |new_dir| to the full path of the directory that was created. The directory
// readable by the current user. Calling this function on the browser process UI /// is only readable by the current user. Calling this function on the browser
// or IO threads is not allowed. /// process UI or IO threads is not allowed.
/// ///
CEF_EXPORT int cef_create_temp_directory_in_directory( CEF_EXPORT int cef_create_temp_directory_in_directory(
const cef_string_t* base_dir, const cef_string_t* base_dir,
@ -88,39 +88,40 @@ CEF_EXPORT int cef_create_temp_directory_in_directory(
cef_string_t* new_dir); cef_string_t* new_dir);
/// ///
// Returns true (1) if the given path exists and is a directory. Calling this /// Returns true (1) if the given path exists and is a directory. Calling this
// function on the browser process UI or IO threads is not allowed. /// function on the browser process UI or IO threads is not allowed.
/// ///
CEF_EXPORT int cef_directory_exists(const cef_string_t* path); CEF_EXPORT int cef_directory_exists(const cef_string_t* path);
/// ///
// Deletes the given path whether it's a file or a directory. If |path| is a /// Deletes the given path whether it's a file or a directory. If |path| is a
// directory all contents will be deleted. If |recursive| is true (1) any sub- /// directory all contents will be deleted. If |recursive| is true (1) any sub-
// directories and their contents will also be deleted (equivalent to executing /// directories and their contents will also be deleted (equivalent to executing
// "rm -rf", so use with caution). On POSIX environments if |path| is a symbolic /// "rm -rf", so use with caution). On POSIX environments if |path| is a
// link then only the symlink will be deleted. Returns true (1) on successful /// symbolic link then only the symlink will be deleted. Returns true (1) on
// deletion or if |path| does not exist. Calling this function on the browser /// successful deletion or if |path| does not exist. Calling this function on
// process UI or IO threads is not allowed. /// the browser process UI or IO threads is not allowed.
/// ///
CEF_EXPORT int cef_delete_file(const cef_string_t* path, int recursive); CEF_EXPORT int cef_delete_file(const cef_string_t* path, int recursive);
/// ///
// Writes the contents of |src_dir| into a zip archive at |dest_file|. If /// Writes the contents of |src_dir| into a zip archive at |dest_file|. If
// |include_hidden_files| is true (1) files starting with "." will be included. /// |include_hidden_files| is true (1) files starting with "." will be included.
// Returns true (1) on success. Calling this function on the browser process UI /// Returns true (1) on success. Calling this function on the browser process
// or IO threads is not allowed. /// UI or IO threads is not allowed.
/// ///
CEF_EXPORT int cef_zip_directory(const cef_string_t* src_dir, CEF_EXPORT int cef_zip_directory(const cef_string_t* src_dir,
const cef_string_t* dest_file, const cef_string_t* dest_file,
int include_hidden_files); int include_hidden_files);
/// ///
// Loads the existing "Certificate Revocation Lists" file that is managed by /// Loads the existing "Certificate Revocation Lists" file that is managed by
// Google Chrome. This file can generally be found in Chrome's User Data /// Google Chrome. This file can generally be found in Chrome's User Data
// directory (e.g. "C:\Users\[User]\AppData\Local\Google\Chrome\User Data\" on /// directory (e.g. "C:\Users\[User]\AppData\Local\Google\Chrome\User Data\" on
// Windows) and is updated periodically by Chrome's component updater service. /// Windows) and is updated periodically by Chrome's component updater service.
// Must be called in the browser process after the context has been initialized. /// Must be called in the browser process after the context has been
// See https://dev.chromium.org/Home/chromium-security/crlsets for background. /// initialized. See https://dev.chromium.org/Home/chromium-security/crlsets for
/// background.
/// ///
CEF_EXPORT void cef_load_crlsets_file(const cef_string_t* path); CEF_EXPORT void cef_load_crlsets_file(const cef_string_t* path);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=f2e80b8637b07f19adea666e554269de4627e399$ // $hash=30e86c9dd440616305f94747b313eb526c4323c7$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_FIND_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_FIND_HANDLER_CAPI_H_
@ -48,23 +48,23 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to handle events related to find results. The /// Implement this structure to handle events related to find results. The
// functions of this structure will be called on the UI thread. /// functions of this structure will be called on the UI thread.
/// ///
typedef struct _cef_find_handler_t { typedef struct _cef_find_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called to report find results returned by cef_browser_host_t::find(). /// Called to report find results returned by cef_browser_host_t::find().
// |identifer| is a unique incremental identifier for the currently active /// |identifer| is a unique incremental identifier for the currently active
// search, |count| is the number of matches currently identified, /// search, |count| is the number of matches currently identified,
// |selectionRect| is the location of where the match was found (in window /// |selectionRect| is the location of where the match was found (in window
// coordinates), |activeMatchOrdinal| is the current position in the search /// coordinates), |activeMatchOrdinal| is the current position in the search
// results, and |finalUpdate| is true (1) if this is the last find /// results, and |finalUpdate| is true (1) if this is the last find
// notification. /// notification.
/// ///
void(CEF_CALLBACK* on_find_result)(struct _cef_find_handler_t* self, void(CEF_CALLBACK* on_find_result)(struct _cef_find_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=a136a2679c8af339b21a89e8ae3090a9dbb8daa7$ // $hash=907b9628ac4b7ab4603dc6e20b7e8675a51987ba$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_FOCUS_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_FOCUS_HANDLER_CAPI_H_
@ -50,36 +50,37 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to handle events related to focus. The functions of /// Implement this structure to handle events related to focus. The functions of
// this structure will be called on the UI thread. /// this structure will be called on the UI thread.
/// ///
typedef struct _cef_focus_handler_t { typedef struct _cef_focus_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called when the browser component is about to loose focus. For instance, if /// Called when the browser component is about to loose focus. For instance,
// focus was on the last HTML element and the user pressed the TAB key. |next| /// if focus was on the last HTML element and the user pressed the TAB key.
// will be true (1) if the browser is giving focus to the next component and /// |next| will be true (1) if the browser is giving focus to the next
// false (0) if the browser is giving focus to the previous component. /// component and false (0) if the browser is giving focus to the previous
/// component.
/// ///
void(CEF_CALLBACK* on_take_focus)(struct _cef_focus_handler_t* self, void(CEF_CALLBACK* on_take_focus)(struct _cef_focus_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
int next); int next);
/// ///
// Called when the browser component is requesting focus. |source| indicates /// Called when the browser component is requesting focus. |source| indicates
// where the focus request is originating from. Return false (0) to allow the /// where the focus request is originating from. Return false (0) to allow the
// focus to be set or true (1) to cancel setting the focus. /// focus to be set or true (1) to cancel setting the focus.
/// ///
int(CEF_CALLBACK* on_set_focus)(struct _cef_focus_handler_t* self, int(CEF_CALLBACK* on_set_focus)(struct _cef_focus_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
cef_focus_source_t source); cef_focus_source_t source);
/// ///
// Called when the browser component has received focus. /// Called when the browser component has received focus.
/// ///
void(CEF_CALLBACK* on_got_focus)(struct _cef_focus_handler_t* self, void(CEF_CALLBACK* on_got_focus)(struct _cef_focus_handler_t* self,
struct _cef_browser_t* browser); struct _cef_browser_t* browser);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=8527ceea6b8778d6fabc1b4ef82e4faa06ba777a$ // $hash=48bc345bb0971e3fcaaf839e9e4419b2aec0e33b$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_FRAME_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_FRAME_CAPI_H_
@ -57,100 +57,100 @@ struct _cef_urlrequest_t;
struct _cef_v8context_t; struct _cef_v8context_t;
/// ///
// Structure used to represent a frame in the browser window. When used in the /// Structure used to represent a frame in the browser window. When used in the
// browser process the functions of this structure may be called on any thread /// browser process the functions of this structure may be called on any thread
// unless otherwise indicated in the comments. When used in the render process /// unless otherwise indicated in the comments. When used in the render process
// the functions of this structure may only be called on the main thread. /// the functions of this structure may only be called on the main thread.
/// ///
typedef struct _cef_frame_t { typedef struct _cef_frame_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// True if this object is currently attached to a valid frame. /// True if this object is currently attached to a valid frame.
/// ///
int(CEF_CALLBACK* is_valid)(struct _cef_frame_t* self); int(CEF_CALLBACK* is_valid)(struct _cef_frame_t* self);
/// ///
// Execute undo in this frame. /// Execute undo in this frame.
/// ///
void(CEF_CALLBACK* undo)(struct _cef_frame_t* self); void(CEF_CALLBACK* undo)(struct _cef_frame_t* self);
/// ///
// Execute redo in this frame. /// Execute redo in this frame.
/// ///
void(CEF_CALLBACK* redo)(struct _cef_frame_t* self); void(CEF_CALLBACK* redo)(struct _cef_frame_t* self);
/// ///
// Execute cut in this frame. /// Execute cut in this frame.
/// ///
void(CEF_CALLBACK* cut)(struct _cef_frame_t* self); void(CEF_CALLBACK* cut)(struct _cef_frame_t* self);
/// ///
// Execute copy in this frame. /// Execute copy in this frame.
/// ///
void(CEF_CALLBACK* copy)(struct _cef_frame_t* self); void(CEF_CALLBACK* copy)(struct _cef_frame_t* self);
/// ///
// Execute paste in this frame. /// Execute paste in this frame.
/// ///
void(CEF_CALLBACK* paste)(struct _cef_frame_t* self); void(CEF_CALLBACK* paste)(struct _cef_frame_t* self);
/// ///
// Execute delete in this frame. /// Execute delete in this frame.
/// ///
void(CEF_CALLBACK* del)(struct _cef_frame_t* self); void(CEF_CALLBACK* del)(struct _cef_frame_t* self);
/// ///
// Execute select all in this frame. /// Execute select all in this frame.
/// ///
void(CEF_CALLBACK* select_all)(struct _cef_frame_t* self); void(CEF_CALLBACK* select_all)(struct _cef_frame_t* self);
/// ///
// Save this frame's HTML source to a temporary file and open it in the /// Save this frame's HTML source to a temporary file and open it in the
// default text viewing application. This function can only be called from the /// default text viewing application. This function can only be called from
// browser process. /// the browser process.
/// ///
void(CEF_CALLBACK* view_source)(struct _cef_frame_t* self); void(CEF_CALLBACK* view_source)(struct _cef_frame_t* self);
/// ///
// Retrieve this frame's HTML source as a string sent to the specified /// Retrieve this frame's HTML source as a string sent to the specified
// visitor. /// visitor.
/// ///
void(CEF_CALLBACK* get_source)(struct _cef_frame_t* self, void(CEF_CALLBACK* get_source)(struct _cef_frame_t* self,
struct _cef_string_visitor_t* visitor); struct _cef_string_visitor_t* visitor);
/// ///
// Retrieve this frame's display text as a string sent to the specified /// Retrieve this frame's display text as a string sent to the specified
// visitor. /// visitor.
/// ///
void(CEF_CALLBACK* get_text)(struct _cef_frame_t* self, void(CEF_CALLBACK* get_text)(struct _cef_frame_t* self,
struct _cef_string_visitor_t* visitor); struct _cef_string_visitor_t* visitor);
/// ///
// Load the request represented by the |request| object. /// Load the request represented by the |request| object.
// ///
// WARNING: This function will fail with "bad IPC message" reason /// WARNING: This function will fail with "bad IPC message" reason
// INVALID_INITIATOR_ORIGIN (213) unless you first navigate to the request /// INVALID_INITIATOR_ORIGIN (213) unless you first navigate to the request
// origin using some other mechanism (LoadURL, link click, etc). /// origin using some other mechanism (LoadURL, link click, etc).
/// ///
void(CEF_CALLBACK* load_request)(struct _cef_frame_t* self, void(CEF_CALLBACK* load_request)(struct _cef_frame_t* self,
struct _cef_request_t* request); struct _cef_request_t* request);
/// ///
// Load the specified |url|. /// Load the specified |url|.
/// ///
void(CEF_CALLBACK* load_url)(struct _cef_frame_t* self, void(CEF_CALLBACK* load_url)(struct _cef_frame_t* self,
const cef_string_t* url); const cef_string_t* url);
/// ///
// Execute a string of JavaScript code in this frame. The |script_url| /// Execute a string of JavaScript code in this frame. The |script_url|
// parameter is the URL where the script in question can be found, if any. The /// parameter is the URL where the script in question can be found, if any.
// renderer may request this URL to show the developer the source of the /// The renderer may request this URL to show the developer the source of the
// error. The |start_line| parameter is the base line number to use for error /// error. The |start_line| parameter is the base line number to use for
// reporting. /// error reporting.
/// ///
void(CEF_CALLBACK* execute_java_script)(struct _cef_frame_t* self, void(CEF_CALLBACK* execute_java_script)(struct _cef_frame_t* self,
const cef_string_t* code, const cef_string_t* code,
@ -158,83 +158,84 @@ typedef struct _cef_frame_t {
int start_line); int start_line);
/// ///
// Returns true (1) if this is the main (top-level) frame. /// Returns true (1) if this is the main (top-level) frame.
/// ///
int(CEF_CALLBACK* is_main)(struct _cef_frame_t* self); int(CEF_CALLBACK* is_main)(struct _cef_frame_t* self);
/// ///
// Returns true (1) if this is the focused frame. /// Returns true (1) if this is the focused frame.
/// ///
int(CEF_CALLBACK* is_focused)(struct _cef_frame_t* self); int(CEF_CALLBACK* is_focused)(struct _cef_frame_t* self);
/// ///
// Returns the name for this frame. If the frame has an assigned name (for /// Returns the name for this frame. If the frame has an assigned name (for
// example, set via the iframe "name" attribute) then that value will be /// example, set via the iframe "name" attribute) then that value will be
// returned. Otherwise a unique name will be constructed based on the frame /// returned. Otherwise a unique name will be constructed based on the frame
// parent hierarchy. The main (top-level) frame will always have an NULL name /// parent hierarchy. The main (top-level) frame will always have an NULL name
// value. /// value.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_name)(struct _cef_frame_t* self); cef_string_userfree_t(CEF_CALLBACK* get_name)(struct _cef_frame_t* self);
/// ///
// Returns the globally unique identifier for this frame or < 0 if the /// Returns the globally unique identifier for this frame or < 0 if the
// underlying frame does not yet exist. /// underlying frame does not yet exist.
/// ///
int64(CEF_CALLBACK* get_identifier)(struct _cef_frame_t* self); int64(CEF_CALLBACK* get_identifier)(struct _cef_frame_t* self);
/// ///
// Returns the parent of this frame or NULL if this is the main (top-level) /// Returns the parent of this frame or NULL if this is the main (top-level)
// frame. /// frame.
/// ///
struct _cef_frame_t*(CEF_CALLBACK* get_parent)(struct _cef_frame_t* self); struct _cef_frame_t*(CEF_CALLBACK* get_parent)(struct _cef_frame_t* self);
/// ///
// Returns the URL currently loaded in this frame. /// Returns the URL currently loaded in this frame.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_url)(struct _cef_frame_t* self); cef_string_userfree_t(CEF_CALLBACK* get_url)(struct _cef_frame_t* self);
/// ///
// Returns the browser that this frame belongs to. /// Returns the browser that this frame belongs to.
/// ///
struct _cef_browser_t*(CEF_CALLBACK* get_browser)(struct _cef_frame_t* self); struct _cef_browser_t*(CEF_CALLBACK* get_browser)(struct _cef_frame_t* self);
/// ///
// Get the V8 context associated with the frame. This function can only be /// Get the V8 context associated with the frame. This function can only be
// called from the render process. /// called from the render process.
/// ///
struct _cef_v8context_t*(CEF_CALLBACK* get_v8context)( struct _cef_v8context_t*(CEF_CALLBACK* get_v8context)(
struct _cef_frame_t* self); struct _cef_frame_t* self);
/// ///
// Visit the DOM document. This function can only be called from the render /// Visit the DOM document. This function can only be called from the render
// process. /// process.
/// ///
void(CEF_CALLBACK* visit_dom)(struct _cef_frame_t* self, void(CEF_CALLBACK* visit_dom)(struct _cef_frame_t* self,
struct _cef_domvisitor_t* visitor); struct _cef_domvisitor_t* visitor);
/// ///
// Create a new URL request that will be treated as originating from this /// Create a new URL request that will be treated as originating from this
// frame and the associated browser. This request may be intercepted by the /// frame and the associated browser. This request may be intercepted by the
// client via cef_resource_request_handler_t or cef_scheme_handler_factory_t. /// client via cef_resource_request_handler_t or cef_scheme_handler_factory_t.
// Use cef_urlrequest_t::Create instead if you do not want the request to have /// Use cef_urlrequest_t::Create instead if you do not want the request to
// this association, in which case it may be handled differently (see /// have this association, in which case it may be handled differently (see
// documentation on that function). Requests may originate from both the /// documentation on that function). Requests may originate from both the
// browser process and the render process. /// browser process and the render process.
// ///
// For requests originating from the browser process: /// For requests originating from the browser process:
// - POST data may only contain a single element of type PDE_TYPE_FILE or /// - POST data may only contain a single element of type PDE_TYPE_FILE or
// PDE_TYPE_BYTES. /// PDE_TYPE_BYTES.
// For requests originating from the render process: ///
// - POST data may only contain a single element of type PDE_TYPE_BYTES. /// For requests originating from the render process:
// - If the response contains Content-Disposition or Mime-Type header values /// - POST data may only contain a single element of type PDE_TYPE_BYTES.
// that would not normally be rendered then the response may receive /// - If the response contains Content-Disposition or Mime-Type header
// special handling inside the browser (for example, via the file download /// values that would not normally be rendered then the response may
// code path instead of the URL request code path). /// receive special handling inside the browser (for example, via the
// /// file download code path instead of the URL request code path).
// The |request| object will be marked as read-only after calling this ///
// function. /// The |request| object will be marked as read-only after calling this
/// function.
/// ///
struct _cef_urlrequest_t*(CEF_CALLBACK* create_urlrequest)( struct _cef_urlrequest_t*(CEF_CALLBACK* create_urlrequest)(
struct _cef_frame_t* self, struct _cef_frame_t* self,
@ -242,12 +243,12 @@ typedef struct _cef_frame_t {
struct _cef_urlrequest_client_t* client); struct _cef_urlrequest_client_t* client);
/// ///
// Send a message to the specified |target_process|. Ownership of the message /// Send a message to the specified |target_process|. Ownership of the message
// contents will be transferred and the |message| reference will be /// contents will be transferred and the |message| reference will be
// invalidated. Message delivery is not guaranteed in all cases (for example, /// invalidated. Message delivery is not guaranteed in all cases (for example,
// if the browser is closing, navigating, or if the target process crashes). /// if the browser is closing, navigating, or if the target process crashes).
// Send an ACK message back from the target process if confirmation is /// Send an ACK message back from the target process if confirmation is
// required. /// required.
/// ///
void(CEF_CALLBACK* send_process_message)( void(CEF_CALLBACK* send_process_message)(
struct _cef_frame_t* self, struct _cef_frame_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=8f791b2d1d5bea27f9e6ca5e0db731a0a76d181c$ // $hash=3d97135fef535cc94aca6cf1afa4a9461c388b4f$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_FRAME_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_FRAME_HANDLER_CAPI_H_
@ -49,107 +49,113 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to handle events related to cef_frame_t life span. /// Implement this structure to handle events related to cef_frame_t life span.
// The order of callbacks is: /// The order of callbacks is:
// ///
// (1) During initial cef_browser_host_t creation and navigation of the main /// (1) During initial cef_browser_host_t creation and navigation of the main
// frame: - cef_frame_handler_t::OnFrameCreated => The initial main frame object /// frame: - cef_frame_handler_t::OnFrameCreated => The initial main frame
// has been /// object has been
// created. Any commands will be queued until the frame is attached. /// created. Any commands will be queued until the frame is attached.
// - cef_frame_handler_t::OnMainFrameChanged => The initial main frame object /// - cef_frame_handler_t::OnMainFrameChanged => The initial main frame object
// has /// has
// been assigned to the browser. /// been assigned to the browser.
// - cef_life_span_handler_t::OnAfterCreated => The browser is now valid and can /// - cef_life_span_handler_t::OnAfterCreated => The browser is now valid and
// be /// can be
// used. /// used.
// - cef_frame_handler_t::OnFrameAttached => The initial main frame object is /// - cef_frame_handler_t::OnFrameAttached => The initial main frame object is
// now /// now
// connected to its peer in the renderer process. Commands can be routed. /// connected to its peer in the renderer process. Commands can be routed.
// ///
// (2) During further cef_browser_host_t navigation/loading of the main frame /// (2) During further cef_browser_host_t navigation/loading of the main frame
// and/or sub-frames: - cef_frame_handler_t::OnFrameCreated => A new main frame /// and/or sub-frames:
// or sub-frame object has /// - cef_frame_handler_t::OnFrameCreated => A new main frame or sub-frame
// been created. Any commands will be queued until the frame is attached. /// object
// - cef_frame_handler_t::OnFrameAttached => A new main frame or sub-frame /// has been created. Any commands will be queued until the frame is attached.
// object is /// - cef_frame_handler_t::OnFrameAttached => A new main frame or sub-frame
// now connected to its peer in the renderer process. Commands can be routed. /// object
// - cef_frame_handler_t::OnFrameDetached => An existing main frame or sub-frame /// is now connected to its peer in the renderer process. Commands can be
// object has lost its connection to the renderer process. If multiple objects /// routed.
// are detached at the same time then notifications will be sent for any /// - cef_frame_handler_t::OnFrameDetached => An existing main frame or sub-
// sub-frame objects before the main frame object. Commands can no longer be /// frame
// routed and will be discarded. /// object has lost its connection to the renderer process. If multiple
// - cef_frame_handler_t::OnMainFrameChanged => A new main frame object has been /// objects are detached at the same time then notifications will be sent for
// assigned to the browser. This will only occur with cross-origin navigation /// any sub-frame objects before the main frame object. Commands can no longer
// or re-navigation after renderer process termination (due to crashes, etc). /// be routed and will be discarded.
// /// - cef_frame_handler_t::OnMainFrameChanged => A new main frame object has
// (3) During final cef_browser_host_t destruction of the main frame: - /// been
// cef_frame_handler_t::OnFrameDetached => Any sub-frame objects have lost their /// assigned to the browser. This will only occur with cross-origin navigation
// connection to the renderer process. Commands can no longer be routed and /// or re-navigation after renderer process termination (due to crashes, etc).
// will be discarded. ///
// - cef_life_span_handler_t::OnBeforeClose => The browser has been destroyed. - /// (3) During final cef_browser_host_t destruction of the main frame: -
// cef_frame_handler_t::OnFrameDetached => The main frame object have lost its /// cef_frame_handler_t::OnFrameDetached => Any sub-frame objects have lost
// connection to the renderer process. Notifications will be sent for any /// their
// sub-frame objects before the main frame object. Commands can no longer be /// connection to the renderer process. Commands can no longer be routed and
// routed and will be discarded. /// will be discarded.
// - cef_frame_handler_t::OnMainFrameChanged => The final main frame object has /// - cef_life_span_handler_t::OnBeforeClose => The browser has been destroyed.
// been /// - cef_frame_handler_t::OnFrameDetached => The main frame object have lost
// removed from the browser. /// its
// /// connection to the renderer process. Notifications will be sent for any
// Cross-origin navigation and/or loading receives special handling. /// sub-frame objects before the main frame object. Commands can no longer be
// /// routed and will be discarded.
// When the main frame navigates to a different origin the OnMainFrameChanged /// - cef_frame_handler_t::OnMainFrameChanged => The final main frame object has
// callback (2) will be executed with the old and new main frame objects. /// been removed from the browser.
// ///
// When a new sub-frame is loaded in, or an existing sub-frame is navigated to, /// Cross-origin navigation and/or loading receives special handling.
// a different origin from the parent frame, a temporary sub-frame object will ///
// first be created in the parent's renderer process. That temporary sub-frame /// When the main frame navigates to a different origin the OnMainFrameChanged
// will then be discarded after the real cross-origin sub-frame is created in /// callback (2) will be executed with the old and new main frame objects.
// the new/target renderer process. The client will receive cross-origin ///
// navigation callbacks (2) for the transition from the temporary sub-frame to /// When a new sub-frame is loaded in, or an existing sub-frame is navigated to,
// the real sub-frame. The temporary sub-frame will not recieve or execute /// a different origin from the parent frame, a temporary sub-frame object will
// commands during this transitional period (any sent commands will be /// first be created in the parent's renderer process. That temporary sub-frame
// discarded). /// will then be discarded after the real cross-origin sub-frame is created in
// /// the new/target renderer process. The client will receive cross-origin
// When a new popup browser is created in a different origin from the parent /// navigation callbacks (2) for the transition from the temporary sub-frame to
// browser, a temporary main frame object for the popup will first be created in /// the real sub-frame. The temporary sub-frame will not recieve or execute
// the parent's renderer process. That temporary main frame will then be /// commands during this transitional period (any sent commands will be
// discarded after the real cross-origin main frame is created in the new/target /// discarded).
// renderer process. The client will recieve creation and initial navigation ///
// callbacks (1) for the temporary main frame, followed by cross-origin /// When a new popup browser is created in a different origin from the parent
// navigation callbacks (2) for the transition from the temporary main frame to /// browser, a temporary main frame object for the popup will first be created
// the real main frame. The temporary main frame may receive and execute /// in the parent's renderer process. That temporary main frame will then be
// commands during this transitional period (any sent commands may be executed, /// discarded after the real cross-origin main frame is created in the
// but the behavior is potentially undesirable since they execute in the parent /// new/target renderer process. The client will recieve creation and initial
// browser's renderer process and not the new/target renderer process). /// navigation callbacks (1) for the temporary main frame, followed by cross-
// /// origin navigation callbacks (2) for the transition from the temporary main
// Callbacks will not be executed for placeholders that may be created during /// frame to the real main frame. The temporary main frame may receive and
// pre-commit navigation for sub-frames that do not yet exist in the renderer /// execute commands during this transitional period (any sent commands may be
// process. Placeholders will have cef_frame_t::get_identifier() == -4. /// executed, but the behavior is potentially undesirable since they execute in
// /// the parent browser's renderer process and not the new/target renderer
// The functions of this structure will be called on the UI thread unless /// process).
// otherwise indicated. ///
/// Callbacks will not be executed for placeholders that may be created during
/// pre-commit navigation for sub-frames that do not yet exist in the renderer
/// process. Placeholders will have cef_frame_t::get_identifier() == -4.
///
/// The functions of this structure will be called on the UI thread unless
/// otherwise indicated.
/// ///
typedef struct _cef_frame_handler_t { typedef struct _cef_frame_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called when a new frame is created. This will be the first notification /// Called when a new frame is created. This will be the first notification
// that references |frame|. Any commands that require transport to the /// that references |frame|. Any commands that require transport to the
// associated renderer process (LoadRequest, SendProcessMessage, GetSource, /// associated renderer process (LoadRequest, SendProcessMessage, GetSource,
// etc.) will be queued until OnFrameAttached is called for |frame|. /// etc.) will be queued until OnFrameAttached is called for |frame|.
/// ///
void(CEF_CALLBACK* on_frame_created)(struct _cef_frame_handler_t* self, void(CEF_CALLBACK* on_frame_created)(struct _cef_frame_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
struct _cef_frame_t* frame); struct _cef_frame_t* frame);
/// ///
// Called when a frame can begin routing commands to/from the associated /// Called when a frame can begin routing commands to/from the associated
// renderer process. |reattached| will be true (1) if the frame was re- /// renderer process. |reattached| will be true (1) if the frame was re-
// attached after exiting the BackForwardCache. Any commands that were queued /// attached after exiting the BackForwardCache. Any commands that were queued
// have now been dispatched. /// have now been dispatched.
/// ///
void(CEF_CALLBACK* on_frame_attached)(struct _cef_frame_handler_t* self, void(CEF_CALLBACK* on_frame_attached)(struct _cef_frame_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -157,29 +163,31 @@ typedef struct _cef_frame_handler_t {
int reattached); int reattached);
/// ///
// Called when a frame loses its connection to the renderer process and will /// Called when a frame loses its connection to the renderer process and will
// be destroyed. Any pending or future commands will be discarded and /// be destroyed. Any pending or future commands will be discarded and
// cef_frame_t::is_valid() will now return false (0) for |frame|. If called /// cef_frame_t::is_valid() will now return false (0) for |frame|. If called
// after cef_life_span_handler_t::on_before_close() during browser destruction /// after cef_life_span_handler_t::on_before_close() during browser
// then cef_browser_t::is_valid() will return false (0) for |browser|. /// destruction then cef_browser_t::is_valid() will return false (0) for
/// |browser|.
/// ///
void(CEF_CALLBACK* on_frame_detached)(struct _cef_frame_handler_t* self, void(CEF_CALLBACK* on_frame_detached)(struct _cef_frame_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
struct _cef_frame_t* frame); struct _cef_frame_t* frame);
/// ///
// Called when the main frame changes due to (a) initial browser creation, (b) /// Called when the main frame changes due to (a) initial browser creation,
// final browser destruction, (c) cross-origin navigation or (d) re-navigation /// (b) final browser destruction, (c) cross-origin navigation or (d) re-
// after renderer process termination (due to crashes, etc). |old_frame| will /// navigation after renderer process termination (due to crashes, etc).
// be NULL and |new_frame| will be non-NULL when a main frame is assigned to /// |old_frame| will be NULL and |new_frame| will be non-NULL when a main
// |browser| for the first time. |old_frame| will be non-NULL and |new_frame| /// frame is assigned to |browser| for the first time. |old_frame| will be
// will be NULL and when a main frame is removed from |browser| for the last /// non-NULL and |new_frame| will be NULL and when a main frame is removed
// time. Both |old_frame| and |new_frame| will be non-NULL for cross-origin /// from |browser| for the last time. Both |old_frame| and |new_frame| will be
// navigations or re-navigation after renderer process termination. This /// non-NULL for cross-origin navigations or re-navigation after renderer
// function will be called after on_frame_created() for |new_frame| and/or /// process termination. This function will be called after on_frame_created()
// after on_frame_detached() for |old_frame|. If called after /// for |new_frame| and/or after on_frame_detached() for |old_frame|. If
// cef_life_span_handler_t::on_before_close() during browser destruction then /// called after cef_life_span_handler_t::on_before_close() during browser
// cef_browser_t::is_valid() will return false (0) for |browser|. /// destruction then cef_browser_t::is_valid() will return false (0) for
/// |browser|.
/// ///
void(CEF_CALLBACK* on_main_frame_changed)(struct _cef_frame_handler_t* self, void(CEF_CALLBACK* on_main_frame_changed)(struct _cef_frame_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=c063e5f0e0c9fef71bdb56e7cc3ea775de17a3ea$ // $hash=14f7f979f668fdae0f080daa39f3c1b2e92162f9$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_I18N_UTIL_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_I18N_UTIL_CAPI_H_
@ -47,7 +47,7 @@ extern "C" {
#endif #endif
/// ///
// Returns true (1) if the application text direction is right-to-left. /// Returns true (1) if the application text direction is right-to-left.
/// ///
CEF_EXPORT int cef_is_rtl(void); CEF_EXPORT int cef_is_rtl(void);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=bbc87eb4ecaf92c900193afef7059caedbe8ab3a$ // $hash=f679dc1ec87e99bed6843d4f4dbbe04585a827bd$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_IMAGE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_IMAGE_CAPI_H_
@ -48,37 +48,37 @@ extern "C" {
#endif #endif
/// ///
// Container for a single image represented at different scale factors. All /// Container for a single image represented at different scale factors. All
// image representations should be the same size in density independent pixel /// image representations should be the same size in density independent pixel
// (DIP) units. For example, if the image at scale factor 1.0 is 100x100 pixels /// (DIP) units. For example, if the image at scale factor 1.0 is 100x100 pixels
// then the image at scale factor 2.0 should be 200x200 pixels -- both images /// then the image at scale factor 2.0 should be 200x200 pixels -- both images
// will display with a DIP size of 100x100 units. The functions of this /// will display with a DIP size of 100x100 units. The functions of this
// structure can be called on any browser process thread. /// structure can be called on any browser process thread.
/// ///
typedef struct _cef_image_t { typedef struct _cef_image_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this Image is NULL. /// Returns true (1) if this Image is NULL.
/// ///
int(CEF_CALLBACK* is_empty)(struct _cef_image_t* self); int(CEF_CALLBACK* is_empty)(struct _cef_image_t* self);
/// ///
// Returns true (1) if this Image and |that| Image share the same underlying /// Returns true (1) if this Image and |that| Image share the same underlying
// storage. Will also return true (1) if both images are NULL. /// storage. Will also return true (1) if both images are NULL.
/// ///
int(CEF_CALLBACK* is_same)(struct _cef_image_t* self, int(CEF_CALLBACK* is_same)(struct _cef_image_t* self,
struct _cef_image_t* that); struct _cef_image_t* that);
/// ///
// Add a bitmap image representation for |scale_factor|. Only 32-bit RGBA/BGRA /// Add a bitmap image representation for |scale_factor|. Only 32-bit
// formats are supported. |pixel_width| and |pixel_height| are the bitmap /// RGBA/BGRA formats are supported. |pixel_width| and |pixel_height| are the
// representation size in pixel coordinates. |pixel_data| is the array of /// bitmap representation size in pixel coordinates. |pixel_data| is the array
// pixel data and should be |pixel_width| x |pixel_height| x 4 bytes in size. /// of pixel data and should be |pixel_width| x |pixel_height| x 4 bytes in
// |color_type| and |alpha_type| values specify the pixel format. /// size. |color_type| and |alpha_type| values specify the pixel format.
/// ///
int(CEF_CALLBACK* add_bitmap)(struct _cef_image_t* self, int(CEF_CALLBACK* add_bitmap)(struct _cef_image_t* self,
float scale_factor, float scale_factor,
@ -90,9 +90,9 @@ typedef struct _cef_image_t {
size_t pixel_data_size); size_t pixel_data_size);
/// ///
// Add a PNG image representation for |scale_factor|. |png_data| is the image /// Add a PNG image representation for |scale_factor|. |png_data| is the image
// data of size |png_data_size|. Any alpha transparency in the PNG data will /// data of size |png_data_size|. Any alpha transparency in the PNG data will
// be maintained. /// be maintained.
/// ///
int(CEF_CALLBACK* add_png)(struct _cef_image_t* self, int(CEF_CALLBACK* add_png)(struct _cef_image_t* self,
float scale_factor, float scale_factor,
@ -100,9 +100,9 @@ typedef struct _cef_image_t {
size_t png_data_size); size_t png_data_size);
/// ///
// Create a JPEG image representation for |scale_factor|. |jpeg_data| is the /// Create a JPEG image representation for |scale_factor|. |jpeg_data| is the
// image data of size |jpeg_data_size|. The JPEG format does not support /// image data of size |jpeg_data_size|. The JPEG format does not support
// transparency so the alpha byte will be set to 0xFF for all pixels. /// transparency so the alpha byte will be set to 0xFF for all pixels.
/// ///
int(CEF_CALLBACK* add_jpeg)(struct _cef_image_t* self, int(CEF_CALLBACK* add_jpeg)(struct _cef_image_t* self,
float scale_factor, float scale_factor,
@ -110,33 +110,34 @@ typedef struct _cef_image_t {
size_t jpeg_data_size); size_t jpeg_data_size);
/// ///
// Returns the image width in density independent pixel (DIP) units. /// Returns the image width in density independent pixel (DIP) units.
/// ///
size_t(CEF_CALLBACK* get_width)(struct _cef_image_t* self); size_t(CEF_CALLBACK* get_width)(struct _cef_image_t* self);
/// ///
// Returns the image height in density independent pixel (DIP) units. /// Returns the image height in density independent pixel (DIP) units.
/// ///
size_t(CEF_CALLBACK* get_height)(struct _cef_image_t* self); size_t(CEF_CALLBACK* get_height)(struct _cef_image_t* self);
/// ///
// Returns true (1) if this image contains a representation for /// Returns true (1) if this image contains a representation for
// |scale_factor|. /// |scale_factor|.
/// ///
int(CEF_CALLBACK* has_representation)(struct _cef_image_t* self, int(CEF_CALLBACK* has_representation)(struct _cef_image_t* self,
float scale_factor); float scale_factor);
/// ///
// Removes the representation for |scale_factor|. Returns true (1) on success. /// Removes the representation for |scale_factor|. Returns true (1) on
/// success.
/// ///
int(CEF_CALLBACK* remove_representation)(struct _cef_image_t* self, int(CEF_CALLBACK* remove_representation)(struct _cef_image_t* self,
float scale_factor); float scale_factor);
/// ///
// Returns information for the representation that most closely matches /// Returns information for the representation that most closely matches
// |scale_factor|. |actual_scale_factor| is the actual scale factor for the /// |scale_factor|. |actual_scale_factor| is the actual scale factor for the
// representation. |pixel_width| and |pixel_height| are the representation /// representation. |pixel_width| and |pixel_height| are the representation
// size in pixel coordinates. Returns true (1) on success. /// size in pixel coordinates. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* get_representation_info)(struct _cef_image_t* self, int(CEF_CALLBACK* get_representation_info)(struct _cef_image_t* self,
float scale_factor, float scale_factor,
@ -145,12 +146,12 @@ typedef struct _cef_image_t {
int* pixel_height); int* pixel_height);
/// ///
// Returns the bitmap representation that most closely matches |scale_factor|. /// Returns the bitmap representation that most closely matches
// Only 32-bit RGBA/BGRA formats are supported. |color_type| and |alpha_type| /// |scale_factor|. Only 32-bit RGBA/BGRA formats are supported. |color_type|
// values specify the desired output pixel format. |pixel_width| and /// and |alpha_type| values specify the desired output pixel format.
// |pixel_height| are the output representation size in pixel coordinates. /// |pixel_width| and |pixel_height| are the output representation size in
// Returns a cef_binary_value_t containing the pixel data on success or NULL /// pixel coordinates. Returns a cef_binary_value_t containing the pixel data
// on failure. /// on success or NULL on failure.
/// ///
struct _cef_binary_value_t*(CEF_CALLBACK* get_as_bitmap)( struct _cef_binary_value_t*(CEF_CALLBACK* get_as_bitmap)(
struct _cef_image_t* self, struct _cef_image_t* self,
@ -161,12 +162,12 @@ typedef struct _cef_image_t {
int* pixel_height); int* pixel_height);
/// ///
// Returns the PNG representation that most closely matches |scale_factor|. If /// Returns the PNG representation that most closely matches |scale_factor|.
// |with_transparency| is true (1) any alpha transparency in the image will be /// If |with_transparency| is true (1) any alpha transparency in the image
// represented in the resulting PNG data. |pixel_width| and |pixel_height| are /// will be represented in the resulting PNG data. |pixel_width| and
// the output representation size in pixel coordinates. Returns a /// |pixel_height| are the output representation size in pixel coordinates.
// cef_binary_value_t containing the PNG image data on success or NULL on /// Returns a cef_binary_value_t containing the PNG image data on success or
// failure. /// NULL on failure.
/// ///
struct _cef_binary_value_t*(CEF_CALLBACK* get_as_png)( struct _cef_binary_value_t*(CEF_CALLBACK* get_as_png)(
struct _cef_image_t* self, struct _cef_image_t* self,
@ -176,13 +177,13 @@ typedef struct _cef_image_t {
int* pixel_height); int* pixel_height);
/// ///
// Returns the JPEG representation that most closely matches |scale_factor|. /// Returns the JPEG representation that most closely matches |scale_factor|.
// |quality| determines the compression level with 0 == lowest and 100 == /// |quality| determines the compression level with 0 == lowest and 100 ==
// highest. The JPEG format does not support alpha transparency and the alpha /// highest. The JPEG format does not support alpha transparency and the alpha
// channel, if any, will be discarded. |pixel_width| and |pixel_height| are /// channel, if any, will be discarded. |pixel_width| and |pixel_height| are
// the output representation size in pixel coordinates. Returns a /// the output representation size in pixel coordinates. Returns a
// cef_binary_value_t containing the JPEG image data on success or NULL on /// cef_binary_value_t containing the JPEG image data on success or NULL on
// failure. /// failure.
/// ///
struct _cef_binary_value_t*(CEF_CALLBACK* get_as_jpeg)( struct _cef_binary_value_t*(CEF_CALLBACK* get_as_jpeg)(
struct _cef_image_t* self, struct _cef_image_t* self,
@ -193,8 +194,8 @@ typedef struct _cef_image_t {
} cef_image_t; } cef_image_t;
/// ///
// Create a new cef_image_t. It will initially be NULL. Use the Add*() functions /// Create a new cef_image_t. It will initially be NULL. Use the Add*()
// to add representations at different scale factors. /// functions to add representations at different scale factors.
/// ///
CEF_EXPORT cef_image_t* cef_image_create(void); CEF_EXPORT cef_image_t* cef_image_create(void);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=942579315e4b8c0819cd2b06becb93670310cd09$ // $hash=523a692475e912e4ecad89842596c3d6eac6f4aa$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_JSDIALOG_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_JSDIALOG_HANDLER_CAPI_H_
@ -48,18 +48,19 @@ extern "C" {
#endif #endif
/// ///
// Callback structure used for asynchronous continuation of JavaScript dialog /// Callback structure used for asynchronous continuation of JavaScript dialog
// requests. /// requests.
/// ///
typedef struct _cef_jsdialog_callback_t { typedef struct _cef_jsdialog_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Continue the JS dialog request. Set |success| to true (1) if the OK button /// Continue the JS dialog request. Set |success| to true (1) if the OK button
// was pressed. The |user_input| value should be specified for prompt dialogs. /// was pressed. The |user_input| value should be specified for prompt
/// dialogs.
/// ///
void(CEF_CALLBACK* cont)(struct _cef_jsdialog_callback_t* self, void(CEF_CALLBACK* cont)(struct _cef_jsdialog_callback_t* self,
int success, int success,
@ -67,31 +68,31 @@ typedef struct _cef_jsdialog_callback_t {
} cef_jsdialog_callback_t; } cef_jsdialog_callback_t;
/// ///
// Implement this structure to handle events related to JavaScript dialogs. The /// Implement this structure to handle events related to JavaScript dialogs. The
// functions of this structure will be called on the UI thread. /// functions of this structure will be called on the UI thread.
/// ///
typedef struct _cef_jsdialog_handler_t { typedef struct _cef_jsdialog_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called to run a JavaScript dialog. If |origin_url| is non-NULL it can be /// Called to run a JavaScript dialog. If |origin_url| is non-NULL it can be
// passed to the CefFormatUrlForSecurityDisplay function to retrieve a secure /// passed to the CefFormatUrlForSecurityDisplay function to retrieve a secure
// and user-friendly display string. The |default_prompt_text| value will be /// and user-friendly display string. The |default_prompt_text| value will be
// specified for prompt dialogs only. Set |suppress_message| to true (1) and /// specified for prompt dialogs only. Set |suppress_message| to true (1) and
// return false (0) to suppress the message (suppressing messages is /// return false (0) to suppress the message (suppressing messages is
// preferable to immediately executing the callback as this is used to detect /// preferable to immediately executing the callback as this is used to detect
// presumably malicious behavior like spamming alert messages in /// presumably malicious behavior like spamming alert messages in
// onbeforeunload). Set |suppress_message| to false (0) and return false (0) /// onbeforeunload). Set |suppress_message| to false (0) and return false (0)
// to use the default implementation (the default implementation will show one /// to use the default implementation (the default implementation will show
// modal dialog at a time and suppress any additional dialog requests until /// one modal dialog at a time and suppress any additional dialog requests
// the displayed dialog is dismissed). Return true (1) if the application will /// until the displayed dialog is dismissed). Return true (1) if the
// use a custom dialog or if the callback has been executed immediately. /// application will use a custom dialog or if the callback has been executed
// Custom dialogs may be either modal or modeless. If a custom dialog is used /// immediately. Custom dialogs may be either modal or modeless. If a custom
// the application must execute |callback| once the custom dialog is /// dialog is used the application must execute |callback| once the custom
// dismissed. /// dialog is dismissed.
/// ///
int(CEF_CALLBACK* on_jsdialog)(struct _cef_jsdialog_handler_t* self, int(CEF_CALLBACK* on_jsdialog)(struct _cef_jsdialog_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -103,12 +104,12 @@ typedef struct _cef_jsdialog_handler_t {
int* suppress_message); int* suppress_message);
/// ///
// Called to run a dialog asking the user if they want to leave a page. Return /// Called to run a dialog asking the user if they want to leave a page.
// false (0) to use the default dialog implementation. Return true (1) if the /// Return false (0) to use the default dialog implementation. Return true (1)
// application will use a custom dialog or if the callback has been executed /// if the application will use a custom dialog or if the callback has been
// immediately. Custom dialogs may be either modal or modeless. If a custom /// executed immediately. Custom dialogs may be either modal or modeless. If a
// dialog is used the application must execute |callback| once the custom /// custom dialog is used the application must execute |callback| once the
// dialog is dismissed. /// custom dialog is dismissed.
/// ///
int(CEF_CALLBACK* on_before_unload_dialog)( int(CEF_CALLBACK* on_before_unload_dialog)(
struct _cef_jsdialog_handler_t* self, struct _cef_jsdialog_handler_t* self,
@ -118,16 +119,16 @@ typedef struct _cef_jsdialog_handler_t {
struct _cef_jsdialog_callback_t* callback); struct _cef_jsdialog_callback_t* callback);
/// ///
// Called to cancel any pending dialogs and reset any saved dialog state. Will /// Called to cancel any pending dialogs and reset any saved dialog state.
// be called due to events like page navigation irregardless of whether any /// Will be called due to events like page navigation irregardless of whether
// dialogs are currently pending. /// any dialogs are currently pending.
/// ///
void(CEF_CALLBACK* on_reset_dialog_state)( void(CEF_CALLBACK* on_reset_dialog_state)(
struct _cef_jsdialog_handler_t* self, struct _cef_jsdialog_handler_t* self,
struct _cef_browser_t* browser); struct _cef_browser_t* browser);
/// ///
// Called when the dialog is closed. /// Called when the dialog is closed.
/// ///
void(CEF_CALLBACK* on_dialog_closed)(struct _cef_jsdialog_handler_t* self, void(CEF_CALLBACK* on_dialog_closed)(struct _cef_jsdialog_handler_t* self,
struct _cef_browser_t* browser); struct _cef_browser_t* browser);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=78320536b0ba210f34a42d0508ce3cd023d7b039$ // $hash=01d7f86c1304efe8dc8758624b74bafccf159e96$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_KEYBOARD_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_KEYBOARD_HANDLER_CAPI_H_
@ -48,21 +48,22 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to handle events related to keyboard input. The /// Implement this structure to handle events related to keyboard input. The
// functions of this structure will be called on the UI thread. /// functions of this structure will be called on the UI thread.
/// ///
typedef struct _cef_keyboard_handler_t { typedef struct _cef_keyboard_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called before a keyboard event is sent to the renderer. |event| contains /// Called before a keyboard event is sent to the renderer. |event| contains
// information about the keyboard event. |os_event| is the operating system /// information about the keyboard event. |os_event| is the operating system
// event message, if any. Return true (1) if the event was handled or false /// event message, if any. Return true (1) if the event was handled or false
// (0) otherwise. If the event will be handled in on_key_event() as a keyboard /// (0) otherwise. If the event will be handled in on_key_event() as a
// shortcut set |is_keyboard_shortcut| to true (1) and return false (0). /// keyboard shortcut set |is_keyboard_shortcut| to true (1) and return false
/// (0).
/// ///
int(CEF_CALLBACK* on_pre_key_event)(struct _cef_keyboard_handler_t* self, int(CEF_CALLBACK* on_pre_key_event)(struct _cef_keyboard_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -71,10 +72,10 @@ typedef struct _cef_keyboard_handler_t {
int* is_keyboard_shortcut); int* is_keyboard_shortcut);
/// ///
// Called after the renderer and JavaScript in the page has had a chance to /// Called after the renderer and JavaScript in the page has had a chance to
// handle the event. |event| contains information about the keyboard event. /// handle the event. |event| contains information about the keyboard event.
// |os_event| is the operating system event message, if any. Return true (1) /// |os_event| is the operating system event message, if any. Return true (1)
// if the keyboard event was handled or false (0) otherwise. /// if the keyboard event was handled or false (0) otherwise.
/// ///
int(CEF_CALLBACK* on_key_event)(struct _cef_keyboard_handler_t* self, int(CEF_CALLBACK* on_key_event)(struct _cef_keyboard_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=5d576b7450a269dcd370e65a187b0c9596801162$ // $hash=44555ceece9989dabfa57a520168fa874dcfe2df$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_LIFE_SPAN_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_LIFE_SPAN_HANDLER_CAPI_H_
@ -50,40 +50,40 @@ extern "C" {
struct _cef_client_t; struct _cef_client_t;
/// ///
// Implement this structure to handle events related to browser life span. The /// Implement this structure to handle events related to browser life span. The
// functions of this structure will be called on the UI thread unless otherwise /// functions of this structure will be called on the UI thread unless otherwise
// indicated. /// indicated.
/// ///
typedef struct _cef_life_span_handler_t { typedef struct _cef_life_span_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called on the UI thread before a new popup browser is created. The /// Called on the UI thread before a new popup browser is created. The
// |browser| and |frame| values represent the source of the popup request. The /// |browser| and |frame| values represent the source of the popup request.
// |target_url| and |target_frame_name| values indicate where the popup /// The |target_url| and |target_frame_name| values indicate where the popup
// browser should navigate and may be NULL if not specified with the request. /// browser should navigate and may be NULL if not specified with the request.
// The |target_disposition| value indicates where the user intended to open /// The |target_disposition| value indicates where the user intended to open
// the popup (e.g. current tab, new tab, etc). The |user_gesture| value will /// the popup (e.g. current tab, new tab, etc). The |user_gesture| value will
// be true (1) if the popup was opened via explicit user gesture (e.g. /// be true (1) if the popup was opened via explicit user gesture (e.g.
// clicking a link) or false (0) if the popup opened automatically (e.g. via /// clicking a link) or false (0) if the popup opened automatically (e.g. via
// the DomContentLoaded event). The |popupFeatures| structure contains /// the DomContentLoaded event). The |popupFeatures| structure contains
// additional information about the requested popup window. To allow creation /// additional information about the requested popup window. To allow creation
// of the popup browser optionally modify |windowInfo|, |client|, |settings| /// of the popup browser optionally modify |windowInfo|, |client|, |settings|
// and |no_javascript_access| and return false (0). To cancel creation of the /// and |no_javascript_access| and return false (0). To cancel creation of the
// popup browser return true (1). The |client| and |settings| values will /// popup browser return true (1). The |client| and |settings| values will
// default to the source browser's values. If the |no_javascript_access| value /// default to the source browser's values. If the |no_javascript_access|
// is set to false (0) the new browser will not be scriptable and may not be /// value is set to false (0) the new browser will not be scriptable and may
// hosted in the same renderer process as the source browser. Any /// not be hosted in the same renderer process as the source browser. Any
// modifications to |windowInfo| will be ignored if the parent browser is /// modifications to |windowInfo| will be ignored if the parent browser is
// wrapped in a cef_browser_view_t. Popup browser creation will be canceled if /// wrapped in a cef_browser_view_t. Popup browser creation will be canceled
// the parent browser is destroyed before the popup browser creation completes /// if the parent browser is destroyed before the popup browser creation
// (indicated by a call to OnAfterCreated for the popup browser). The /// completes (indicated by a call to OnAfterCreated for the popup browser).
// |extra_info| parameter provides an opportunity to specify extra information /// The |extra_info| parameter provides an opportunity to specify extra
// specific to the created popup browser that will be passed to /// information specific to the created popup browser that will be passed to
// cef_render_process_handler_t::on_browser_created() in the render process. /// cef_render_process_handler_t::on_browser_created() in the render process.
/// ///
int(CEF_CALLBACK* on_before_popup)( int(CEF_CALLBACK* on_before_popup)(
struct _cef_life_span_handler_t* self, struct _cef_life_span_handler_t* self,
@ -101,117 +101,118 @@ typedef struct _cef_life_span_handler_t {
int* no_javascript_access); int* no_javascript_access);
/// ///
// Called after a new browser is created. It is now safe to begin performing /// Called after a new browser is created. It is now safe to begin performing
// actions with |browser|. cef_frame_handler_t callbacks related to initial /// actions with |browser|. cef_frame_handler_t callbacks related to initial
// main frame creation will arrive before this callback. See /// main frame creation will arrive before this callback. See
// cef_frame_handler_t documentation for additional usage information. /// cef_frame_handler_t documentation for additional usage information.
/// ///
void(CEF_CALLBACK* on_after_created)(struct _cef_life_span_handler_t* self, void(CEF_CALLBACK* on_after_created)(struct _cef_life_span_handler_t* self,
struct _cef_browser_t* browser); struct _cef_browser_t* browser);
/// ///
// Called when a browser has recieved a request to close. This may result /// Called when a browser has recieved a request to close. This may result
// directly from a call to cef_browser_host_t::*close_browser() or indirectly /// directly from a call to cef_browser_host_t::*close_browser() or indirectly
// if the browser is parented to a top-level window created by CEF and the /// if the browser is parented to a top-level window created by CEF and the
// user attempts to close that window (by clicking the 'X', for example). The /// user attempts to close that window (by clicking the 'X', for example). The
// do_close() function will be called after the JavaScript 'onunload' event /// do_close() function will be called after the JavaScript 'onunload' event
// has been fired. /// has been fired.
// ///
// An application should handle top-level owner window close notifications by /// An application should handle top-level owner window close notifications by
// calling cef_browser_host_t::try_close_browser() or /// calling cef_browser_host_t::try_close_browser() or
// cef_browser_host_t::CloseBrowser(false (0)) instead of allowing the window /// cef_browser_host_t::CloseBrowser(false (0)) instead of allowing the window
// to close immediately (see the examples below). This gives CEF an /// to close immediately (see the examples below). This gives CEF an
// opportunity to process the 'onbeforeunload' event and optionally cancel the /// opportunity to process the 'onbeforeunload' event and optionally cancel
// close before do_close() is called. /// the close before do_close() is called.
// ///
// When windowed rendering is enabled CEF will internally create a window or /// When windowed rendering is enabled CEF will internally create a window or
// view to host the browser. In that case returning false (0) from do_close() /// view to host the browser. In that case returning false (0) from do_close()
// will send the standard close notification to the browser's top-level owner /// will send the standard close notification to the browser's top-level owner
// window (e.g. WM_CLOSE on Windows, performClose: on OS X, "delete_event" on /// window (e.g. WM_CLOSE on Windows, performClose: on OS X, "delete_event" on
// Linux or cef_window_delegate_t::can_close() callback from Views). If the /// Linux or cef_window_delegate_t::can_close() callback from Views). If the
// browser's host window/view has already been destroyed (via view hierarchy /// browser's host window/view has already been destroyed (via view hierarchy
// tear-down, for example) then do_close() will not be called for that browser /// tear-down, for example) then do_close() will not be called for that
// since is no longer possible to cancel the close. /// browser since is no longer possible to cancel the close.
// ///
// When windowed rendering is disabled returning false (0) from do_close() /// When windowed rendering is disabled returning false (0) from do_close()
// will cause the browser object to be destroyed immediately. /// will cause the browser object to be destroyed immediately.
// ///
// If the browser's top-level owner window requires a non-standard close /// If the browser's top-level owner window requires a non-standard close
// notification then send that notification from do_close() and return true /// notification then send that notification from do_close() and return true
// (1). /// (1).
// ///
// The cef_life_span_handler_t::on_before_close() function will be called /// The cef_life_span_handler_t::on_before_close() function will be called
// after do_close() (if do_close() is called) and immediately before the /// after do_close() (if do_close() is called) and immediately before the
// browser object is destroyed. The application should only exit after /// browser object is destroyed. The application should only exit after
// on_before_close() has been called for all existing browsers. /// on_before_close() has been called for all existing browsers.
// ///
// The below examples describe what should happen during window close when the /// The below examples describe what should happen during window close when
// browser is parented to an application-provided top-level window. /// the browser is parented to an application-provided top-level window.
// ///
// Example 1: Using cef_browser_host_t::try_close_browser(). This is /// Example 1: Using cef_browser_host_t::try_close_browser(). This is
// recommended for clients using standard close handling and windows created /// recommended for clients using standard close handling and windows created
// on the browser process UI thread. 1. User clicks the window close button /// on the browser process UI thread. 1. User clicks the window close button
// which sends a close notification to /// which sends a close notification
// the application's top-level window. /// to the application's top-level window.
// 2. Application's top-level window receives the close notification and /// 2. Application's top-level window receives the close notification and
// calls TryCloseBrowser() (which internally calls CloseBrowser(false)). /// calls TryCloseBrowser() (which internally calls CloseBrowser(false)).
// TryCloseBrowser() returns false so the client cancels the window close. /// TryCloseBrowser() returns false so the client cancels the window
// 3. JavaScript 'onbeforeunload' handler executes and shows the close /// close.
// confirmation dialog (which can be overridden via /// 3. JavaScript 'onbeforeunload' handler executes and shows the close
// CefJSDialogHandler::OnBeforeUnloadDialog()). /// confirmation dialog (which can be overridden via
// 4. User approves the close. 5. JavaScript 'onunload' handler executes. 6. /// CefJSDialogHandler::OnBeforeUnloadDialog()).
// CEF sends a close notification to the application's top-level window /// 4. User approves the close. 5. JavaScript 'onunload' handler executes.
// (because DoClose() returned false by default). /// 6. CEF sends a close notification to the application's top-level window
// 7. Application's top-level window receives the close notification and /// (because DoClose() returned false by default).
// calls TryCloseBrowser(). TryCloseBrowser() returns true so the client /// 7. Application's top-level window receives the close notification and
// allows the window close. /// calls TryCloseBrowser(). TryCloseBrowser() returns true so the client
// 8. Application's top-level window is destroyed. 9. Application's /// allows the window close.
// on_before_close() handler is called and the browser object /// 8. Application's top-level window is destroyed. 9. Application's
// is destroyed. /// on_before_close() handler is called and the browser object
// 10. Application exits by calling cef_quit_message_loop() if no other /// is destroyed.
// browsers /// 10. Application exits by calling cef_quit_message_loop() if no other
// exist. /// browsers
// /// exist.
// Example 2: Using cef_browser_host_t::CloseBrowser(false (0)) and ///
// implementing the do_close() callback. This is recommended for clients using /// Example 2: Using cef_browser_host_t::CloseBrowser(false (0)) and
// non-standard close handling or windows that were not created on the browser /// implementing the do_close() callback. This is recommended for clients
// process UI thread. 1. User clicks the window close button which sends a /// using non-standard close handling or windows that were not created on the
// close notification to /// browser process UI thread. 1. User clicks the window close button which
// the application's top-level window. /// sends a close notification
// 2. Application's top-level window receives the close notification and: /// to the application's top-level window.
// A. Calls CefBrowserHost::CloseBrowser(false). /// 2. Application's top-level window receives the close notification and:
// B. Cancels the window close. /// A. Calls CefBrowserHost::CloseBrowser(false).
// 3. JavaScript 'onbeforeunload' handler executes and shows the close /// B. Cancels the window close.
// confirmation dialog (which can be overridden via /// 3. JavaScript 'onbeforeunload' handler executes and shows the close
// CefJSDialogHandler::OnBeforeUnloadDialog()). /// confirmation dialog (which can be overridden via
// 4. User approves the close. 5. JavaScript 'onunload' handler executes. 6. /// CefJSDialogHandler::OnBeforeUnloadDialog()).
// Application's do_close() handler is called. Application will: /// 4. User approves the close. 5. JavaScript 'onunload' handler executes.
// A. Set a flag to indicate that the next close attempt will be allowed. /// 6. Application's do_close() handler is called. Application will:
// B. Return false. /// A. Set a flag to indicate that the next close attempt will be allowed.
// 7. CEF sends an close notification to the application's top-level window. /// B. Return false.
// 8. Application's top-level window receives the close notification and /// 7. CEF sends an close notification to the application's top-level window.
// allows the window to close based on the flag from #6B. /// 8. Application's top-level window receives the close notification and
// 9. Application's top-level window is destroyed. 10. Application's /// allows the window to close based on the flag from #6B.
// on_before_close() handler is called and the browser object /// 9. Application's top-level window is destroyed. 10. Application's
// is destroyed. /// on_before_close() handler is called and the browser object
// 11. Application exits by calling cef_quit_message_loop() if no other /// is destroyed.
// browsers /// 11. Application exits by calling cef_quit_message_loop() if no other
// exist. /// browsers
/// exist.
/// ///
int(CEF_CALLBACK* do_close)(struct _cef_life_span_handler_t* self, int(CEF_CALLBACK* do_close)(struct _cef_life_span_handler_t* self,
struct _cef_browser_t* browser); struct _cef_browser_t* browser);
/// ///
// Called just before a browser is destroyed. Release all references to the /// Called just before a browser is destroyed. Release all references to the
// browser object and do not attempt to execute any functions on the browser /// browser object and do not attempt to execute any functions on the browser
// object (other than IsValid, GetIdentifier or IsSame) after this callback /// object (other than IsValid, GetIdentifier or IsSame) after this callback
// returns. cef_frame_handler_t callbacks related to final main frame /// returns. cef_frame_handler_t callbacks related to final main frame
// destruction will arrive after this callback and cef_browser_t::IsValid will /// destruction will arrive after this callback and cef_browser_t::IsValid
// return false (0) at that time. Any in-progress network requests associated /// will return false (0) at that time. Any in-progress network requests
// with |browser| will be aborted when the browser is destroyed, and /// associated with |browser| will be aborted when the browser is destroyed,
// cef_resource_request_handler_t callbacks related to those requests may /// and cef_resource_request_handler_t callbacks related to those requests may
// still arrive on the IO thread after this callback. See cef_frame_handler_t /// still arrive on the IO thread after this callback. See cef_frame_handler_t
// and do_close() documentation for additional usage information. /// and do_close() documentation for additional usage information.
/// ///
void(CEF_CALLBACK* on_before_close)(struct _cef_life_span_handler_t* self, void(CEF_CALLBACK* on_before_close)(struct _cef_life_span_handler_t* self,
struct _cef_browser_t* browser); struct _cef_browser_t* browser);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=f51b6a0dbf264fa43ea3199327a5adb1044bfc04$ // $hash=2713381c9969d7039e6c1a1ed2527e5aeb5425ce$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_LOAD_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_LOAD_HANDLER_CAPI_H_
@ -49,22 +49,22 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to handle events related to browser load status. The /// Implement this structure to handle events related to browser load status.
// functions of this structure will be called on the browser process UI thread /// The functions of this structure will be called on the browser process UI
// or render process main thread (TID_RENDERER). /// thread or render process main thread (TID_RENDERER).
/// ///
typedef struct _cef_load_handler_t { typedef struct _cef_load_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called when the loading state has changed. This callback will be executed /// Called when the loading state has changed. This callback will be executed
// twice -- once when loading is initiated either programmatically or by user /// twice -- once when loading is initiated either programmatically or by user
// action, and once when loading is terminated due to completion, cancellation /// action, and once when loading is terminated due to completion,
// of failure. It will be called before any calls to OnLoadStart and after all /// cancellation of failure. It will be called before any calls to OnLoadStart
// calls to OnLoadError and/or OnLoadEnd. /// and after all calls to OnLoadError and/or OnLoadEnd.
/// ///
void(CEF_CALLBACK* on_loading_state_change)(struct _cef_load_handler_t* self, void(CEF_CALLBACK* on_loading_state_change)(struct _cef_load_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -73,16 +73,16 @@ typedef struct _cef_load_handler_t {
int canGoForward); int canGoForward);
/// ///
// Called after a navigation has been committed and before the browser begins /// Called after a navigation has been committed and before the browser begins
// loading contents in the frame. The |frame| value will never be NULL -- call /// loading contents in the frame. The |frame| value will never be NULL --
// the is_main() function to check if this frame is the main frame. /// call the is_main() function to check if this frame is the main frame.
// |transition_type| provides information about the source of the navigation /// |transition_type| provides information about the source of the navigation
// and an accurate value is only available in the browser process. Multiple /// and an accurate value is only available in the browser process. Multiple
// frames may be loading at the same time. Sub-frames may start or continue /// frames may be loading at the same time. Sub-frames may start or continue
// loading after the main frame load has ended. This function will not be /// loading after the main frame load has ended. This function will not be
// called for same page navigations (fragments, history state, etc.) or for /// called for same page navigations (fragments, history state, etc.) or for
// navigations that fail or are canceled before commit. For notification of /// navigations that fail or are canceled before commit. For notification of
// overall browser load status use OnLoadingStateChange instead. /// overall browser load status use OnLoadingStateChange instead.
/// ///
void(CEF_CALLBACK* on_load_start)(struct _cef_load_handler_t* self, void(CEF_CALLBACK* on_load_start)(struct _cef_load_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -90,14 +90,14 @@ typedef struct _cef_load_handler_t {
cef_transition_type_t transition_type); cef_transition_type_t transition_type);
/// ///
// Called when the browser is done loading a frame. The |frame| value will /// Called when the browser is done loading a frame. The |frame| value will
// never be NULL -- call the is_main() function to check if this frame is the /// never be NULL -- call the is_main() function to check if this frame is the
// main frame. Multiple frames may be loading at the same time. Sub-frames may /// main frame. Multiple frames may be loading at the same time. Sub-frames
// start or continue loading after the main frame load has ended. This /// may start or continue loading after the main frame load has ended. This
// function will not be called for same page navigations (fragments, history /// function will not be called for same page navigations (fragments, history
// state, etc.) or for navigations that fail or are canceled before commit. /// state, etc.) or for navigations that fail or are canceled before commit.
// For notification of overall browser load status use OnLoadingStateChange /// For notification of overall browser load status use OnLoadingStateChange
// instead. /// instead.
/// ///
void(CEF_CALLBACK* on_load_end)(struct _cef_load_handler_t* self, void(CEF_CALLBACK* on_load_end)(struct _cef_load_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -105,11 +105,11 @@ typedef struct _cef_load_handler_t {
int httpStatusCode); int httpStatusCode);
/// ///
// Called when a navigation fails or is canceled. This function may be called /// Called when a navigation fails or is canceled. This function may be called
// by itself if before commit or in combination with OnLoadStart/OnLoadEnd if /// by itself if before commit or in combination with OnLoadStart/OnLoadEnd if
// after commit. |errorCode| is the error code number, |errorText| is the /// after commit. |errorCode| is the error code number, |errorText| is the
// error text and |failedUrl| is the URL that failed to load. See /// error text and |failedUrl| is the URL that failed to load. See
// net\base\net_error_list.h for complete descriptions of the error codes. /// net\base\net_error_list.h for complete descriptions of the error codes.
/// ///
void(CEF_CALLBACK* on_load_error)(struct _cef_load_handler_t* self, void(CEF_CALLBACK* on_load_error)(struct _cef_load_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=3db7459a1940c37898699cc97f69ba9249a6f1fd$ // $hash=77920892e7d9e8b98106e0bc8dfcf4b4c52a24e6$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_MEDIA_ROUTER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_MEDIA_ROUTER_CAPI_H_
@ -56,46 +56,46 @@ struct _cef_media_sink_t;
struct _cef_media_source_t; struct _cef_media_source_t;
/// ///
// Supports discovery of and communication with media devices on the local /// Supports discovery of and communication with media devices on the local
// network via the Cast and DIAL protocols. The functions of this structure may /// network via the Cast and DIAL protocols. The functions of this structure may
// be called on any browser process thread unless otherwise indicated. /// be called on any browser process thread unless otherwise indicated.
/// ///
typedef struct _cef_media_router_t { typedef struct _cef_media_router_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Add an observer for MediaRouter events. The observer will remain registered /// Add an observer for MediaRouter events. The observer will remain
// until the returned Registration object is destroyed. /// registered until the returned Registration object is destroyed.
/// ///
struct _cef_registration_t*(CEF_CALLBACK* add_observer)( struct _cef_registration_t*(CEF_CALLBACK* add_observer)(
struct _cef_media_router_t* self, struct _cef_media_router_t* self,
struct _cef_media_observer_t* observer); struct _cef_media_observer_t* observer);
/// ///
// Returns a MediaSource object for the specified media source URN. Supported /// Returns a MediaSource object for the specified media source URN. Supported
// URN schemes include "cast:" and "dial:", and will be already known by the /// URN schemes include "cast:" and "dial:", and will be already known by the
// client application (e.g. "cast:<appId>?clientId=<clientId>"). /// client application (e.g. "cast:<appId>?clientId=<clientId>").
/// ///
struct _cef_media_source_t*(CEF_CALLBACK* get_source)( struct _cef_media_source_t*(CEF_CALLBACK* get_source)(
struct _cef_media_router_t* self, struct _cef_media_router_t* self,
const cef_string_t* urn); const cef_string_t* urn);
/// ///
// Trigger an asynchronous call to cef_media_observer_t::OnSinks on all /// Trigger an asynchronous call to cef_media_observer_t::OnSinks on all
// registered observers. /// registered observers.
/// ///
void(CEF_CALLBACK* notify_current_sinks)(struct _cef_media_router_t* self); void(CEF_CALLBACK* notify_current_sinks)(struct _cef_media_router_t* self);
/// ///
// Create a new route between |source| and |sink|. Source and sink must be /// Create a new route between |source| and |sink|. Source and sink must be
// valid, compatible (as reported by cef_media_sink_t::IsCompatibleWith), and /// valid, compatible (as reported by cef_media_sink_t::IsCompatibleWith), and
// a route between them must not already exist. |callback| will be executed on /// a route between them must not already exist. |callback| will be executed
// success or failure. If route creation succeeds it will also trigger an /// on success or failure. If route creation succeeds it will also trigger an
// asynchronous call to cef_media_observer_t::OnRoutes on all registered /// asynchronous call to cef_media_observer_t::OnRoutes on all registered
// observers. /// observers.
/// ///
void(CEF_CALLBACK* create_route)( void(CEF_CALLBACK* create_route)(
struct _cef_media_router_t* self, struct _cef_media_router_t* self,
@ -104,51 +104,51 @@ typedef struct _cef_media_router_t {
struct _cef_media_route_create_callback_t* callback); struct _cef_media_route_create_callback_t* callback);
/// ///
// Trigger an asynchronous call to cef_media_observer_t::OnRoutes on all /// Trigger an asynchronous call to cef_media_observer_t::OnRoutes on all
// registered observers. /// registered observers.
/// ///
void(CEF_CALLBACK* notify_current_routes)(struct _cef_media_router_t* self); void(CEF_CALLBACK* notify_current_routes)(struct _cef_media_router_t* self);
} cef_media_router_t; } cef_media_router_t;
/// ///
// Returns the MediaRouter object associated with the global request context. If /// Returns the MediaRouter object associated with the global request context.
// |callback| is non-NULL it will be executed asnychronously on the UI thread /// If |callback| is non-NULL it will be executed asnychronously on the UI
// after the manager's storage has been initialized. Equivalent to calling cef_r /// thread after the manager's storage has been initialized. Equivalent to
// equest_context_t::cef_request_context_get_global_context()->get_media_router( /// calling cef_request_context_t::cef_request_context_get_global_context()->get
// ). /// _media_router().
/// ///
CEF_EXPORT cef_media_router_t* cef_media_router_get_global( CEF_EXPORT cef_media_router_t* cef_media_router_get_global(
struct _cef_completion_callback_t* callback); struct _cef_completion_callback_t* callback);
/// ///
// Implemented by the client to observe MediaRouter events and registered via /// Implemented by the client to observe MediaRouter events and registered via
// cef_media_router_t::AddObserver. The functions of this structure will be /// cef_media_router_t::AddObserver. The functions of this structure will be
// called on the browser process UI thread. /// called on the browser process UI thread.
/// ///
typedef struct _cef_media_observer_t { typedef struct _cef_media_observer_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// The list of available media sinks has changed or /// The list of available media sinks has changed or
// cef_media_router_t::NotifyCurrentSinks was called. /// cef_media_router_t::NotifyCurrentSinks was called.
/// ///
void(CEF_CALLBACK* on_sinks)(struct _cef_media_observer_t* self, void(CEF_CALLBACK* on_sinks)(struct _cef_media_observer_t* self,
size_t sinksCount, size_t sinksCount,
struct _cef_media_sink_t* const* sinks); struct _cef_media_sink_t* const* sinks);
/// ///
// The list of available media routes has changed or /// The list of available media routes has changed or
// cef_media_router_t::NotifyCurrentRoutes was called. /// cef_media_router_t::NotifyCurrentRoutes was called.
/// ///
void(CEF_CALLBACK* on_routes)(struct _cef_media_observer_t* self, void(CEF_CALLBACK* on_routes)(struct _cef_media_observer_t* self,
size_t routesCount, size_t routesCount,
struct _cef_media_route_t* const* routes); struct _cef_media_route_t* const* routes);
/// ///
// The connection state of |route| has changed. /// The connection state of |route| has changed.
/// ///
void(CEF_CALLBACK* on_route_state_changed)( void(CEF_CALLBACK* on_route_state_changed)(
struct _cef_media_observer_t* self, struct _cef_media_observer_t* self,
@ -156,8 +156,8 @@ typedef struct _cef_media_observer_t {
cef_media_route_connection_state_t state); cef_media_route_connection_state_t state);
/// ///
// A message was recieved over |route|. |message| is only valid for the scope /// A message was recieved over |route|. |message| is only valid for the scope
// of this callback and should be copied if necessary. /// of this callback and should be copied if necessary.
/// ///
void(CEF_CALLBACK* on_route_message_received)( void(CEF_CALLBACK* on_route_message_received)(
struct _cef_media_observer_t* self, struct _cef_media_observer_t* self,
@ -167,65 +167,65 @@ typedef struct _cef_media_observer_t {
} cef_media_observer_t; } cef_media_observer_t;
/// ///
// Represents the route between a media source and sink. Instances of this /// Represents the route between a media source and sink. Instances of this
// object are created via cef_media_router_t::CreateRoute and retrieved via /// object are created via cef_media_router_t::CreateRoute and retrieved via
// cef_media_observer_t::OnRoutes. Contains the status and metadata of a routing /// cef_media_observer_t::OnRoutes. Contains the status and metadata of a
// operation. The functions of this structure may be called on any browser /// routing operation. The functions of this structure may be called on any
// process thread unless otherwise indicated. /// browser process thread unless otherwise indicated.
/// ///
typedef struct _cef_media_route_t { typedef struct _cef_media_route_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns the ID for this route. /// Returns the ID for this route.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_id)(struct _cef_media_route_t* self); cef_string_userfree_t(CEF_CALLBACK* get_id)(struct _cef_media_route_t* self);
/// ///
// Returns the source associated with this route. /// Returns the source associated with this route.
/// ///
struct _cef_media_source_t*(CEF_CALLBACK* get_source)( struct _cef_media_source_t*(CEF_CALLBACK* get_source)(
struct _cef_media_route_t* self); struct _cef_media_route_t* self);
/// ///
// Returns the sink associated with this route. /// Returns the sink associated with this route.
/// ///
struct _cef_media_sink_t*(CEF_CALLBACK* get_sink)( struct _cef_media_sink_t*(CEF_CALLBACK* get_sink)(
struct _cef_media_route_t* self); struct _cef_media_route_t* self);
/// ///
// Send a message over this route. |message| will be copied if necessary. /// Send a message over this route. |message| will be copied if necessary.
/// ///
void(CEF_CALLBACK* send_route_message)(struct _cef_media_route_t* self, void(CEF_CALLBACK* send_route_message)(struct _cef_media_route_t* self,
const void* message, const void* message,
size_t message_size); size_t message_size);
/// ///
// Terminate this route. Will result in an asynchronous call to /// Terminate this route. Will result in an asynchronous call to
// cef_media_observer_t::OnRoutes on all registered observers. /// cef_media_observer_t::OnRoutes on all registered observers.
/// ///
void(CEF_CALLBACK* terminate)(struct _cef_media_route_t* self); void(CEF_CALLBACK* terminate)(struct _cef_media_route_t* self);
} cef_media_route_t; } cef_media_route_t;
/// ///
// Callback structure for cef_media_router_t::CreateRoute. The functions of this /// Callback structure for cef_media_router_t::CreateRoute. The functions of
// structure will be called on the browser process UI thread. /// this structure will be called on the browser process UI thread.
/// ///
typedef struct _cef_media_route_create_callback_t { typedef struct _cef_media_route_create_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Method that will be executed when the route creation has finished. |result| /// Method that will be executed when the route creation has finished.
// will be CEF_MRCR_OK if the route creation succeeded. |error| will be a /// |result| will be CEF_MRCR_OK if the route creation succeeded. |error| will
// description of the error if the route creation failed. |route| is the /// be a description of the error if the route creation failed. |route| is the
// resulting route, or NULL if the route creation failed. /// resulting route, or NULL if the route creation failed.
/// ///
void(CEF_CALLBACK* on_media_route_create_finished)( void(CEF_CALLBACK* on_media_route_create_finished)(
struct _cef_media_route_create_callback_t* self, struct _cef_media_route_create_callback_t* self,
@ -235,78 +235,78 @@ typedef struct _cef_media_route_create_callback_t {
} cef_media_route_create_callback_t; } cef_media_route_create_callback_t;
/// ///
// Represents a sink to which media can be routed. Instances of this object are /// Represents a sink to which media can be routed. Instances of this object are
// retrieved via cef_media_observer_t::OnSinks. The functions of this structure /// retrieved via cef_media_observer_t::OnSinks. The functions of this structure
// may be called on any browser process thread unless otherwise indicated. /// may be called on any browser process thread unless otherwise indicated.
/// ///
typedef struct _cef_media_sink_t { typedef struct _cef_media_sink_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns the ID for this sink. /// Returns the ID for this sink.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_id)(struct _cef_media_sink_t* self); cef_string_userfree_t(CEF_CALLBACK* get_id)(struct _cef_media_sink_t* self);
/// ///
// Returns the name of this sink. /// Returns the name of this sink.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_name)(struct _cef_media_sink_t* self); cef_string_userfree_t(CEF_CALLBACK* get_name)(struct _cef_media_sink_t* self);
/// ///
// Returns the description of this sink. /// Returns the description of this sink.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_description)( cef_string_userfree_t(CEF_CALLBACK* get_description)(
struct _cef_media_sink_t* self); struct _cef_media_sink_t* self);
/// ///
// Returns the icon type for this sink. /// Returns the icon type for this sink.
/// ///
cef_media_sink_icon_type_t(CEF_CALLBACK* get_icon_type)( cef_media_sink_icon_type_t(CEF_CALLBACK* get_icon_type)(
struct _cef_media_sink_t* self); struct _cef_media_sink_t* self);
/// ///
// Asynchronously retrieves device info. /// Asynchronously retrieves device info.
/// ///
void(CEF_CALLBACK* get_device_info)( void(CEF_CALLBACK* get_device_info)(
struct _cef_media_sink_t* self, struct _cef_media_sink_t* self,
struct _cef_media_sink_device_info_callback_t* callback); struct _cef_media_sink_device_info_callback_t* callback);
/// ///
// Returns true (1) if this sink accepts content via Cast. /// Returns true (1) if this sink accepts content via Cast.
/// ///
int(CEF_CALLBACK* is_cast_sink)(struct _cef_media_sink_t* self); int(CEF_CALLBACK* is_cast_sink)(struct _cef_media_sink_t* self);
/// ///
// Returns true (1) if this sink accepts content via DIAL. /// Returns true (1) if this sink accepts content via DIAL.
/// ///
int(CEF_CALLBACK* is_dial_sink)(struct _cef_media_sink_t* self); int(CEF_CALLBACK* is_dial_sink)(struct _cef_media_sink_t* self);
/// ///
// Returns true (1) if this sink is compatible with |source|. /// Returns true (1) if this sink is compatible with |source|.
/// ///
int(CEF_CALLBACK* is_compatible_with)(struct _cef_media_sink_t* self, int(CEF_CALLBACK* is_compatible_with)(struct _cef_media_sink_t* self,
struct _cef_media_source_t* source); struct _cef_media_source_t* source);
} cef_media_sink_t; } cef_media_sink_t;
/// ///
// Callback structure for cef_media_sink_t::GetDeviceInfo. The functions of this /// Callback structure for cef_media_sink_t::GetDeviceInfo. The functions of
// structure will be called on the browser process UI thread. /// this structure will be called on the browser process UI thread.
/// ///
typedef struct _cef_media_sink_device_info_callback_t { typedef struct _cef_media_sink_device_info_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Method that will be executed asyncronously once device information has been /// Method that will be executed asyncronously once device information has
// retrieved. /// been retrieved.
/// ///
void(CEF_CALLBACK* on_media_sink_device_info)( void(CEF_CALLBACK* on_media_sink_device_info)(
struct _cef_media_sink_device_info_callback_t* self, struct _cef_media_sink_device_info_callback_t* self,
@ -314,30 +314,30 @@ typedef struct _cef_media_sink_device_info_callback_t {
} cef_media_sink_device_info_callback_t; } cef_media_sink_device_info_callback_t;
/// ///
// Represents a source from which media can be routed. Instances of this object /// Represents a source from which media can be routed. Instances of this object
// are retrieved via cef_media_router_t::GetSource. The functions of this /// are retrieved via cef_media_router_t::GetSource. The functions of this
// structure may be called on any browser process thread unless otherwise /// structure may be called on any browser process thread unless otherwise
// indicated. /// indicated.
/// ///
typedef struct _cef_media_source_t { typedef struct _cef_media_source_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns the ID (media source URN or URL) for this source. /// Returns the ID (media source URN or URL) for this source.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_id)(struct _cef_media_source_t* self); cef_string_userfree_t(CEF_CALLBACK* get_id)(struct _cef_media_source_t* self);
/// ///
// Returns true (1) if this source outputs its content via Cast. /// Returns true (1) if this source outputs its content via Cast.
/// ///
int(CEF_CALLBACK* is_cast_source)(struct _cef_media_source_t* self); int(CEF_CALLBACK* is_cast_source)(struct _cef_media_source_t* self);
/// ///
// Returns true (1) if this source outputs its content via DIAL. /// Returns true (1) if this source outputs its content via DIAL.
/// ///
int(CEF_CALLBACK* is_dial_source)(struct _cef_media_source_t* self); int(CEF_CALLBACK* is_dial_source)(struct _cef_media_source_t* self);
} cef_media_source_t; } cef_media_source_t;

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=77ac3e0cda15dd166c24e3f94671d1f9c9776142$ // $hash=4bf9250599e3ba26e7f74ec22338548492202625$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_MENU_MODEL_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_MENU_MODEL_CAPI_H_
@ -48,54 +48,54 @@ extern "C" {
#endif #endif
/// ///
// Supports creation and modification of menus. See cef_menu_id_t for the /// Supports creation and modification of menus. See cef_menu_id_t for the
// command ids that have default implementations. All user-defined command ids /// command ids that have default implementations. All user-defined command ids
// should be between MENU_ID_USER_FIRST and MENU_ID_USER_LAST. The functions of /// should be between MENU_ID_USER_FIRST and MENU_ID_USER_LAST. The functions of
// this structure can only be accessed on the browser process the UI thread. /// this structure can only be accessed on the browser process the UI thread.
/// ///
typedef struct _cef_menu_model_t { typedef struct _cef_menu_model_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this menu is a submenu. /// Returns true (1) if this menu is a submenu.
/// ///
int(CEF_CALLBACK* is_sub_menu)(struct _cef_menu_model_t* self); int(CEF_CALLBACK* is_sub_menu)(struct _cef_menu_model_t* self);
/// ///
// Clears the menu. Returns true (1) on success. /// Clears the menu. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* clear)(struct _cef_menu_model_t* self); int(CEF_CALLBACK* clear)(struct _cef_menu_model_t* self);
/// ///
// Returns the number of items in this menu. /// Returns the number of items in this menu.
/// ///
size_t(CEF_CALLBACK* get_count)(struct _cef_menu_model_t* self); size_t(CEF_CALLBACK* get_count)(struct _cef_menu_model_t* self);
/// ///
// Add a separator to the menu. Returns true (1) on success. /// Add a separator to the menu. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* add_separator)(struct _cef_menu_model_t* self); int(CEF_CALLBACK* add_separator)(struct _cef_menu_model_t* self);
/// ///
// Add an item to the menu. Returns true (1) on success. /// Add an item to the menu. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* add_item)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* add_item)(struct _cef_menu_model_t* self,
int command_id, int command_id,
const cef_string_t* label); const cef_string_t* label);
/// ///
// Add a check item to the menu. Returns true (1) on success. /// Add a check item to the menu. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* add_check_item)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* add_check_item)(struct _cef_menu_model_t* self,
int command_id, int command_id,
const cef_string_t* label); const cef_string_t* label);
/// ///
// Add a radio item to the menu. Only a single item with the specified /// Add a radio item to the menu. Only a single item with the specified
// |group_id| can be checked at a time. Returns true (1) on success. /// |group_id| can be checked at a time. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* add_radio_item)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* add_radio_item)(struct _cef_menu_model_t* self,
int command_id, int command_id,
@ -103,7 +103,7 @@ typedef struct _cef_menu_model_t {
int group_id); int group_id);
/// ///
// Add a sub-menu to the menu. The new sub-menu is returned. /// Add a sub-menu to the menu. The new sub-menu is returned.
/// ///
struct _cef_menu_model_t*(CEF_CALLBACK* add_sub_menu)( struct _cef_menu_model_t*(CEF_CALLBACK* add_sub_menu)(
struct _cef_menu_model_t* self, struct _cef_menu_model_t* self,
@ -111,15 +111,15 @@ typedef struct _cef_menu_model_t {
const cef_string_t* label); const cef_string_t* label);
/// ///
// Insert a separator in the menu at the specified |index|. Returns true (1) /// Insert a separator in the menu at the specified |index|. Returns true (1)
// on success. /// on success.
/// ///
int(CEF_CALLBACK* insert_separator_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* insert_separator_at)(struct _cef_menu_model_t* self,
size_t index); size_t index);
/// ///
// Insert an item in the menu at the specified |index|. Returns true (1) on /// Insert an item in the menu at the specified |index|. Returns true (1) on
// success. /// success.
/// ///
int(CEF_CALLBACK* insert_item_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* insert_item_at)(struct _cef_menu_model_t* self,
size_t index, size_t index,
@ -127,8 +127,8 @@ typedef struct _cef_menu_model_t {
const cef_string_t* label); const cef_string_t* label);
/// ///
// Insert a check item in the menu at the specified |index|. Returns true (1) /// Insert a check item in the menu at the specified |index|. Returns true (1)
// on success. /// on success.
/// ///
int(CEF_CALLBACK* insert_check_item_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* insert_check_item_at)(struct _cef_menu_model_t* self,
size_t index, size_t index,
@ -136,9 +136,9 @@ typedef struct _cef_menu_model_t {
const cef_string_t* label); const cef_string_t* label);
/// ///
// Insert a radio item in the menu at the specified |index|. Only a single /// Insert a radio item in the menu at the specified |index|. Only a single
// item with the specified |group_id| can be checked at a time. Returns true /// item with the specified |group_id| can be checked at a time. Returns true
// (1) on success. /// (1) on success.
/// ///
int(CEF_CALLBACK* insert_radio_item_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* insert_radio_item_at)(struct _cef_menu_model_t* self,
size_t index, size_t index,
@ -147,8 +147,8 @@ typedef struct _cef_menu_model_t {
int group_id); int group_id);
/// ///
// Insert a sub-menu in the menu at the specified |index|. The new sub-menu is /// Insert a sub-menu in the menu at the specified |index|. The new sub-menu
// returned. /// is returned.
/// ///
struct _cef_menu_model_t*(CEF_CALLBACK* insert_sub_menu_at)( struct _cef_menu_model_t*(CEF_CALLBACK* insert_sub_menu_at)(
struct _cef_menu_model_t* self, struct _cef_menu_model_t* self,
@ -157,219 +157,220 @@ typedef struct _cef_menu_model_t {
const cef_string_t* label); const cef_string_t* label);
/// ///
// Removes the item with the specified |command_id|. Returns true (1) on /// Removes the item with the specified |command_id|. Returns true (1) on
// success. /// success.
/// ///
int(CEF_CALLBACK* remove)(struct _cef_menu_model_t* self, int command_id); int(CEF_CALLBACK* remove)(struct _cef_menu_model_t* self, int command_id);
/// ///
// Removes the item at the specified |index|. Returns true (1) on success. /// Removes the item at the specified |index|. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* remove_at)(struct _cef_menu_model_t* self, size_t index); int(CEF_CALLBACK* remove_at)(struct _cef_menu_model_t* self, size_t index);
/// ///
// Returns the index associated with the specified |command_id| or -1 if not /// Returns the index associated with the specified |command_id| or -1 if not
// found due to the command id not existing in the menu. /// found due to the command id not existing in the menu.
/// ///
int(CEF_CALLBACK* get_index_of)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* get_index_of)(struct _cef_menu_model_t* self,
int command_id); int command_id);
/// ///
// Returns the command id at the specified |index| or -1 if not found due to /// Returns the command id at the specified |index| or -1 if not found due to
// invalid range or the index being a separator. /// invalid range or the index being a separator.
/// ///
int(CEF_CALLBACK* get_command_id_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* get_command_id_at)(struct _cef_menu_model_t* self,
size_t index); size_t index);
/// ///
// Sets the command id at the specified |index|. Returns true (1) on success. /// Sets the command id at the specified |index|. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_command_id_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_command_id_at)(struct _cef_menu_model_t* self,
size_t index, size_t index,
int command_id); int command_id);
/// ///
// Returns the label for the specified |command_id| or NULL if not found. /// Returns the label for the specified |command_id| or NULL if not found.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_label)(struct _cef_menu_model_t* self, cef_string_userfree_t(CEF_CALLBACK* get_label)(struct _cef_menu_model_t* self,
int command_id); int command_id);
/// ///
// Returns the label at the specified |index| or NULL if not found due to /// Returns the label at the specified |index| or NULL if not found due to
// invalid range or the index being a separator. /// invalid range or the index being a separator.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t( cef_string_userfree_t(
CEF_CALLBACK* get_label_at)(struct _cef_menu_model_t* self, size_t index); CEF_CALLBACK* get_label_at)(struct _cef_menu_model_t* self, size_t index);
/// ///
// Sets the label for the specified |command_id|. Returns true (1) on success. /// Sets the label for the specified |command_id|. Returns true (1) on
/// success.
/// ///
int(CEF_CALLBACK* set_label)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_label)(struct _cef_menu_model_t* self,
int command_id, int command_id,
const cef_string_t* label); const cef_string_t* label);
/// ///
// Set the label at the specified |index|. Returns true (1) on success. /// Set the label at the specified |index|. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_label_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_label_at)(struct _cef_menu_model_t* self,
size_t index, size_t index,
const cef_string_t* label); const cef_string_t* label);
/// ///
// Returns the item type for the specified |command_id|. /// Returns the item type for the specified |command_id|.
/// ///
cef_menu_item_type_t(CEF_CALLBACK* get_type)(struct _cef_menu_model_t* self, cef_menu_item_type_t(CEF_CALLBACK* get_type)(struct _cef_menu_model_t* self,
int command_id); int command_id);
/// ///
// Returns the item type at the specified |index|. /// Returns the item type at the specified |index|.
/// ///
cef_menu_item_type_t( cef_menu_item_type_t(
CEF_CALLBACK* get_type_at)(struct _cef_menu_model_t* self, size_t index); CEF_CALLBACK* get_type_at)(struct _cef_menu_model_t* self, size_t index);
/// ///
// Returns the group id for the specified |command_id| or -1 if invalid. /// Returns the group id for the specified |command_id| or -1 if invalid.
/// ///
int(CEF_CALLBACK* get_group_id)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* get_group_id)(struct _cef_menu_model_t* self,
int command_id); int command_id);
/// ///
// Returns the group id at the specified |index| or -1 if invalid. /// Returns the group id at the specified |index| or -1 if invalid.
/// ///
int(CEF_CALLBACK* get_group_id_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* get_group_id_at)(struct _cef_menu_model_t* self,
size_t index); size_t index);
/// ///
// Sets the group id for the specified |command_id|. Returns true (1) on /// Sets the group id for the specified |command_id|. Returns true (1) on
// success. /// success.
/// ///
int(CEF_CALLBACK* set_group_id)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_group_id)(struct _cef_menu_model_t* self,
int command_id, int command_id,
int group_id); int group_id);
/// ///
// Sets the group id at the specified |index|. Returns true (1) on success. /// Sets the group id at the specified |index|. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_group_id_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_group_id_at)(struct _cef_menu_model_t* self,
size_t index, size_t index,
int group_id); int group_id);
/// ///
// Returns the submenu for the specified |command_id| or NULL if invalid. /// Returns the submenu for the specified |command_id| or NULL if invalid.
/// ///
struct _cef_menu_model_t*(CEF_CALLBACK* get_sub_menu)( struct _cef_menu_model_t*(CEF_CALLBACK* get_sub_menu)(
struct _cef_menu_model_t* self, struct _cef_menu_model_t* self,
int command_id); int command_id);
/// ///
// Returns the submenu at the specified |index| or NULL if invalid. /// Returns the submenu at the specified |index| or NULL if invalid.
/// ///
struct _cef_menu_model_t*(CEF_CALLBACK* get_sub_menu_at)( struct _cef_menu_model_t*(CEF_CALLBACK* get_sub_menu_at)(
struct _cef_menu_model_t* self, struct _cef_menu_model_t* self,
size_t index); size_t index);
/// ///
// Returns true (1) if the specified |command_id| is visible. /// Returns true (1) if the specified |command_id| is visible.
/// ///
int(CEF_CALLBACK* is_visible)(struct _cef_menu_model_t* self, int command_id); int(CEF_CALLBACK* is_visible)(struct _cef_menu_model_t* self, int command_id);
/// ///
// Returns true (1) if the specified |index| is visible. /// Returns true (1) if the specified |index| is visible.
/// ///
int(CEF_CALLBACK* is_visible_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* is_visible_at)(struct _cef_menu_model_t* self,
size_t index); size_t index);
/// ///
// Change the visibility of the specified |command_id|. Returns true (1) on /// Change the visibility of the specified |command_id|. Returns true (1) on
// success. /// success.
/// ///
int(CEF_CALLBACK* set_visible)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_visible)(struct _cef_menu_model_t* self,
int command_id, int command_id,
int visible); int visible);
/// ///
// Change the visibility at the specified |index|. Returns true (1) on /// Change the visibility at the specified |index|. Returns true (1) on
// success. /// success.
/// ///
int(CEF_CALLBACK* set_visible_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_visible_at)(struct _cef_menu_model_t* self,
size_t index, size_t index,
int visible); int visible);
/// ///
// Returns true (1) if the specified |command_id| is enabled. /// Returns true (1) if the specified |command_id| is enabled.
/// ///
int(CEF_CALLBACK* is_enabled)(struct _cef_menu_model_t* self, int command_id); int(CEF_CALLBACK* is_enabled)(struct _cef_menu_model_t* self, int command_id);
/// ///
// Returns true (1) if the specified |index| is enabled. /// Returns true (1) if the specified |index| is enabled.
/// ///
int(CEF_CALLBACK* is_enabled_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* is_enabled_at)(struct _cef_menu_model_t* self,
size_t index); size_t index);
/// ///
// Change the enabled status of the specified |command_id|. Returns true (1) /// Change the enabled status of the specified |command_id|. Returns true (1)
// on success. /// on success.
/// ///
int(CEF_CALLBACK* set_enabled)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_enabled)(struct _cef_menu_model_t* self,
int command_id, int command_id,
int enabled); int enabled);
/// ///
// Change the enabled status at the specified |index|. Returns true (1) on /// Change the enabled status at the specified |index|. Returns true (1) on
// success. /// success.
/// ///
int(CEF_CALLBACK* set_enabled_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_enabled_at)(struct _cef_menu_model_t* self,
size_t index, size_t index,
int enabled); int enabled);
/// ///
// Returns true (1) if the specified |command_id| is checked. Only applies to /// Returns true (1) if the specified |command_id| is checked. Only applies to
// check and radio items. /// check and radio items.
/// ///
int(CEF_CALLBACK* is_checked)(struct _cef_menu_model_t* self, int command_id); int(CEF_CALLBACK* is_checked)(struct _cef_menu_model_t* self, int command_id);
/// ///
// Returns true (1) if the specified |index| is checked. Only applies to check /// Returns true (1) if the specified |index| is checked. Only applies to
// and radio items. /// check and radio items.
/// ///
int(CEF_CALLBACK* is_checked_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* is_checked_at)(struct _cef_menu_model_t* self,
size_t index); size_t index);
/// ///
// Check the specified |command_id|. Only applies to check and radio items. /// Check the specified |command_id|. Only applies to check and radio items.
// Returns true (1) on success. /// Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_checked)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_checked)(struct _cef_menu_model_t* self,
int command_id, int command_id,
int checked); int checked);
/// ///
// Check the specified |index|. Only applies to check and radio items. Returns /// Check the specified |index|. Only applies to check and radio items.
// true (1) on success. /// Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_checked_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_checked_at)(struct _cef_menu_model_t* self,
size_t index, size_t index,
int checked); int checked);
/// ///
// Returns true (1) if the specified |command_id| has a keyboard accelerator /// Returns true (1) if the specified |command_id| has a keyboard accelerator
// assigned. /// assigned.
/// ///
int(CEF_CALLBACK* has_accelerator)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* has_accelerator)(struct _cef_menu_model_t* self,
int command_id); int command_id);
/// ///
// Returns true (1) if the specified |index| has a keyboard accelerator /// Returns true (1) if the specified |index| has a keyboard accelerator
// assigned. /// assigned.
/// ///
int(CEF_CALLBACK* has_accelerator_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* has_accelerator_at)(struct _cef_menu_model_t* self,
size_t index); size_t index);
/// ///
// Set the keyboard accelerator for the specified |command_id|. |key_code| can /// Set the keyboard accelerator for the specified |command_id|. |key_code|
// be any virtual key or character value. Returns true (1) on success. /// can be any virtual key or character value. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_accelerator)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_accelerator)(struct _cef_menu_model_t* self,
int command_id, int command_id,
@ -379,8 +380,8 @@ typedef struct _cef_menu_model_t {
int alt_pressed); int alt_pressed);
/// ///
// Set the keyboard accelerator at the specified |index|. |key_code| can be /// Set the keyboard accelerator at the specified |index|. |key_code| can be
// any virtual key or character value. Returns true (1) on success. /// any virtual key or character value. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_accelerator_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_accelerator_at)(struct _cef_menu_model_t* self,
size_t index, size_t index,
@ -390,22 +391,22 @@ typedef struct _cef_menu_model_t {
int alt_pressed); int alt_pressed);
/// ///
// Remove the keyboard accelerator for the specified |command_id|. Returns /// Remove the keyboard accelerator for the specified |command_id|. Returns
// true (1) on success. /// true (1) on success.
/// ///
int(CEF_CALLBACK* remove_accelerator)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* remove_accelerator)(struct _cef_menu_model_t* self,
int command_id); int command_id);
/// ///
// Remove the keyboard accelerator at the specified |index|. Returns true (1) /// Remove the keyboard accelerator at the specified |index|. Returns true (1)
// on success. /// on success.
/// ///
int(CEF_CALLBACK* remove_accelerator_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* remove_accelerator_at)(struct _cef_menu_model_t* self,
size_t index); size_t index);
/// ///
// Retrieves the keyboard accelerator for the specified |command_id|. Returns /// Retrieves the keyboard accelerator for the specified |command_id|. Returns
// true (1) on success. /// true (1) on success.
/// ///
int(CEF_CALLBACK* get_accelerator)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* get_accelerator)(struct _cef_menu_model_t* self,
int command_id, int command_id,
@ -415,8 +416,8 @@ typedef struct _cef_menu_model_t {
int* alt_pressed); int* alt_pressed);
/// ///
// Retrieves the keyboard accelerator for the specified |index|. Returns true /// Retrieves the keyboard accelerator for the specified |index|. Returns true
// (1) on success. /// (1) on success.
/// ///
int(CEF_CALLBACK* get_accelerator_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* get_accelerator_at)(struct _cef_menu_model_t* self,
size_t index, size_t index,
@ -426,10 +427,10 @@ typedef struct _cef_menu_model_t {
int* alt_pressed); int* alt_pressed);
/// ///
// Set the explicit color for |command_id| and |color_type| to |color|. /// Set the explicit color for |command_id| and |color_type| to |color|.
// Specify a |color| value of 0 to remove the explicit color. If no explicit /// Specify a |color| value of 0 to remove the explicit color. If no explicit
// color or default color is set for |color_type| then the system color will /// color or default color is set for |color_type| then the system color will
// be used. Returns true (1) on success. /// be used. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_color)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_color)(struct _cef_menu_model_t* self,
int command_id, int command_id,
@ -437,11 +438,11 @@ typedef struct _cef_menu_model_t {
cef_color_t color); cef_color_t color);
/// ///
// Set the explicit color for |command_id| and |index| to |color|. Specify a /// Set the explicit color for |command_id| and |index| to |color|. Specify a
// |color| value of 0 to remove the explicit color. Specify an |index| value /// |color| value of 0 to remove the explicit color. Specify an |index| value
// of -1 to set the default color for items that do not have an explicit color /// of -1 to set the default color for items that do not have an explicit
// set. If no explicit color or default color is set for |color_type| then the /// color set. If no explicit color or default color is set for |color_type|
// system color will be used. Returns true (1) on success. /// then the system color will be used. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_color_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_color_at)(struct _cef_menu_model_t* self,
int index, int index,
@ -449,9 +450,9 @@ typedef struct _cef_menu_model_t {
cef_color_t color); cef_color_t color);
/// ///
// Returns in |color| the color that was explicitly set for |command_id| and /// Returns in |color| the color that was explicitly set for |command_id| and
// |color_type|. If a color was not set then 0 will be returned in |color|. /// |color_type|. If a color was not set then 0 will be returned in |color|.
// Returns true (1) on success. /// Returns true (1) on success.
/// ///
int(CEF_CALLBACK* get_color)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* get_color)(struct _cef_menu_model_t* self,
int command_id, int command_id,
@ -459,10 +460,10 @@ typedef struct _cef_menu_model_t {
cef_color_t* color); cef_color_t* color);
/// ///
// Returns in |color| the color that was explicitly set for |command_id| and /// Returns in |color| the color that was explicitly set for |command_id| and
// |color_type|. Specify an |index| value of -1 to return the default color in /// |color_type|. Specify an |index| value of -1 to return the default color
// |color|. If a color was not set then 0 will be returned in |color|. Returns /// in |color|. If a color was not set then 0 will be returned in |color|.
// true (1) on success. /// Returns true (1) on success.
/// ///
int(CEF_CALLBACK* get_color_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* get_color_at)(struct _cef_menu_model_t* self,
int index, int index,
@ -470,33 +471,33 @@ typedef struct _cef_menu_model_t {
cef_color_t* color); cef_color_t* color);
/// ///
// Sets the font list for the specified |command_id|. If |font_list| is NULL /// Sets the font list for the specified |command_id|. If |font_list| is NULL
// the system font will be used. Returns true (1) on success. The format is /// the system font will be used. Returns true (1) on success. The format is
// "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", where: - FONT_FAMILY_LIST is a comma- /// "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", where: - FONT_FAMILY_LIST is a
// separated list of font family names, - STYLES is an optional space- /// comma-separated list of font family names, - STYLES is an optional space-
// separated list of style names (case-sensitive /// separated list of style names
// "Bold" and "Italic" are supported), and /// (case-sensitive "Bold" and "Italic" are supported), and
// - SIZE is an integer font size in pixels with the suffix "px". /// - SIZE is an integer font size in pixels with the suffix "px".
// ///
// Here are examples of valid font description strings: - "Arial, Helvetica, /// Here are examples of valid font description strings: - "Arial, Helvetica,
// Bold Italic 14px" - "Arial, 14px" /// Bold Italic 14px" - "Arial, 14px"
/// ///
int(CEF_CALLBACK* set_font_list)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_font_list)(struct _cef_menu_model_t* self,
int command_id, int command_id,
const cef_string_t* font_list); const cef_string_t* font_list);
/// ///
// Sets the font list for the specified |index|. Specify an |index| value of /// Sets the font list for the specified |index|. Specify an |index| value of
// -1 to set the default font. If |font_list| is NULL the system font will be /// -1 to set the default font. If |font_list| is NULL the system font will be
// used. Returns true (1) on success. The format is /// used. Returns true (1) on success. The format is
// "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", where: - FONT_FAMILY_LIST is a comma- /// "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", where: - FONT_FAMILY_LIST is a
// separated list of font family names, - STYLES is an optional space- /// comma-separated list of font family names, - STYLES is an optional space-
// separated list of style names (case-sensitive /// separated list of style names
// "Bold" and "Italic" are supported), and /// (case-sensitive "Bold" and "Italic" are supported), and
// - SIZE is an integer font size in pixels with the suffix "px". /// - SIZE is an integer font size in pixels with the suffix "px".
// ///
// Here are examples of valid font description strings: - "Arial, Helvetica, /// Here are examples of valid font description strings: - "Arial, Helvetica,
// Bold Italic 14px" - "Arial, 14px" /// Bold Italic 14px" - "Arial, 14px"
/// ///
int(CEF_CALLBACK* set_font_list_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_font_list_at)(struct _cef_menu_model_t* self,
int index, int index,
@ -504,7 +505,7 @@ typedef struct _cef_menu_model_t {
} cef_menu_model_t; } cef_menu_model_t;
/// ///
// Create a new MenuModel with the specified |delegate|. /// Create a new MenuModel with the specified |delegate|.
/// ///
CEF_EXPORT cef_menu_model_t* cef_menu_model_create( CEF_EXPORT cef_menu_model_t* cef_menu_model_create(
struct _cef_menu_model_delegate_t* delegate); struct _cef_menu_model_delegate_t* delegate);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=bdb670bcaa9eb9f5748900ad25bcc061155d6076$ // $hash=8254165498a527d40517c1bc8ec413ad7a0ed259$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_MENU_MODEL_DELEGATE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_MENU_MODEL_DELEGATE_CAPI_H_
@ -49,19 +49,19 @@ extern "C" {
struct _cef_menu_model_t; struct _cef_menu_model_t;
/// ///
// Implement this structure to handle menu model events. The functions of this /// Implement this structure to handle menu model events. The functions of this
// structure will be called on the browser process UI thread unless otherwise /// structure will be called on the browser process UI thread unless otherwise
// indicated. /// indicated.
/// ///
typedef struct _cef_menu_model_delegate_t { typedef struct _cef_menu_model_delegate_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Perform the action associated with the specified |command_id| and optional /// Perform the action associated with the specified |command_id| and optional
// |event_flags|. /// |event_flags|.
/// ///
void(CEF_CALLBACK* execute_command)(struct _cef_menu_model_delegate_t* self, void(CEF_CALLBACK* execute_command)(struct _cef_menu_model_delegate_t* self,
struct _cef_menu_model_t* menu_model, struct _cef_menu_model_t* menu_model,
@ -69,8 +69,8 @@ typedef struct _cef_menu_model_delegate_t {
cef_event_flags_t event_flags); cef_event_flags_t event_flags);
/// ///
// Called when the user moves the mouse outside the menu and over the owning /// Called when the user moves the mouse outside the menu and over the owning
// window. /// window.
/// ///
void(CEF_CALLBACK* mouse_outside_menu)( void(CEF_CALLBACK* mouse_outside_menu)(
struct _cef_menu_model_delegate_t* self, struct _cef_menu_model_delegate_t* self,
@ -78,8 +78,8 @@ typedef struct _cef_menu_model_delegate_t {
const cef_point_t* screen_point); const cef_point_t* screen_point);
/// ///
// Called on unhandled open submenu keyboard commands. |is_rtl| will be true /// Called on unhandled open submenu keyboard commands. |is_rtl| will be true
// (1) if the menu is displaying a right-to-left language. /// (1) if the menu is displaying a right-to-left language.
/// ///
void(CEF_CALLBACK* unhandled_open_submenu)( void(CEF_CALLBACK* unhandled_open_submenu)(
struct _cef_menu_model_delegate_t* self, struct _cef_menu_model_delegate_t* self,
@ -87,8 +87,8 @@ typedef struct _cef_menu_model_delegate_t {
int is_rtl); int is_rtl);
/// ///
// Called on unhandled close submenu keyboard commands. |is_rtl| will be true /// Called on unhandled close submenu keyboard commands. |is_rtl| will be true
// (1) if the menu is displaying a right-to-left language. /// (1) if the menu is displaying a right-to-left language.
/// ///
void(CEF_CALLBACK* unhandled_close_submenu)( void(CEF_CALLBACK* unhandled_close_submenu)(
struct _cef_menu_model_delegate_t* self, struct _cef_menu_model_delegate_t* self,
@ -96,20 +96,20 @@ typedef struct _cef_menu_model_delegate_t {
int is_rtl); int is_rtl);
/// ///
// The menu is about to show. /// The menu is about to show.
/// ///
void(CEF_CALLBACK* menu_will_show)(struct _cef_menu_model_delegate_t* self, void(CEF_CALLBACK* menu_will_show)(struct _cef_menu_model_delegate_t* self,
struct _cef_menu_model_t* menu_model); struct _cef_menu_model_t* menu_model);
/// ///
// The menu has closed. /// The menu has closed.
/// ///
void(CEF_CALLBACK* menu_closed)(struct _cef_menu_model_delegate_t* self, void(CEF_CALLBACK* menu_closed)(struct _cef_menu_model_delegate_t* self,
struct _cef_menu_model_t* menu_model); struct _cef_menu_model_t* menu_model);
/// ///
// Optionally modify a menu item label. Return true (1) if |label| was /// Optionally modify a menu item label. Return true (1) if |label| was
// modified. /// modified.
/// ///
int(CEF_CALLBACK* format_label)(struct _cef_menu_model_delegate_t* self, int(CEF_CALLBACK* format_label)(struct _cef_menu_model_delegate_t* self,
struct _cef_menu_model_t* menu_model, struct _cef_menu_model_t* menu_model,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=6f617dd09dc2abc0c2c7534db2b045aebb595f09$ // $hash=2822d96d72b7df816c0fefb4ce1cbba18add50ac$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_NAVIGATION_ENTRY_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_NAVIGATION_ENTRY_CAPI_H_
@ -48,78 +48,79 @@ extern "C" {
#endif #endif
/// ///
// Structure used to represent an entry in navigation history. /// Structure used to represent an entry in navigation history.
/// ///
typedef struct _cef_navigation_entry_t { typedef struct _cef_navigation_entry_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is valid. Do not call any other functions /// Returns true (1) if this object is valid. Do not call any other functions
// if this function returns false (0). /// if this function returns false (0).
/// ///
int(CEF_CALLBACK* is_valid)(struct _cef_navigation_entry_t* self); int(CEF_CALLBACK* is_valid)(struct _cef_navigation_entry_t* self);
/// ///
// Returns the actual URL of the page. For some pages this may be data: URL or /// Returns the actual URL of the page. For some pages this may be data: URL
// similar. Use get_display_url() to return a display-friendly version. /// or similar. Use get_display_url() to return a display-friendly version.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_url)( cef_string_userfree_t(CEF_CALLBACK* get_url)(
struct _cef_navigation_entry_t* self); struct _cef_navigation_entry_t* self);
/// ///
// Returns a display-friendly version of the URL. /// Returns a display-friendly version of the URL.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_display_url)( cef_string_userfree_t(CEF_CALLBACK* get_display_url)(
struct _cef_navigation_entry_t* self); struct _cef_navigation_entry_t* self);
/// ///
// Returns the original URL that was entered by the user before any redirects. /// Returns the original URL that was entered by the user before any
/// redirects.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_original_url)( cef_string_userfree_t(CEF_CALLBACK* get_original_url)(
struct _cef_navigation_entry_t* self); struct _cef_navigation_entry_t* self);
/// ///
// Returns the title set by the page. This value may be NULL. /// Returns the title set by the page. This value may be NULL.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_title)( cef_string_userfree_t(CEF_CALLBACK* get_title)(
struct _cef_navigation_entry_t* self); struct _cef_navigation_entry_t* self);
/// ///
// Returns the transition type which indicates what the user did to move to /// Returns the transition type which indicates what the user did to move to
// this page from the previous page. /// this page from the previous page.
/// ///
cef_transition_type_t(CEF_CALLBACK* get_transition_type)( cef_transition_type_t(CEF_CALLBACK* get_transition_type)(
struct _cef_navigation_entry_t* self); struct _cef_navigation_entry_t* self);
/// ///
// Returns true (1) if this navigation includes post data. /// Returns true (1) if this navigation includes post data.
/// ///
int(CEF_CALLBACK* has_post_data)(struct _cef_navigation_entry_t* self); int(CEF_CALLBACK* has_post_data)(struct _cef_navigation_entry_t* self);
/// ///
// Returns the time for the last known successful navigation completion. A /// Returns the time for the last known successful navigation completion. A
// navigation may be completed more than once if the page is reloaded. May be /// navigation may be completed more than once if the page is reloaded. May be
// 0 if the navigation has not yet completed. /// 0 if the navigation has not yet completed.
/// ///
cef_basetime_t(CEF_CALLBACK* get_completion_time)( cef_basetime_t(CEF_CALLBACK* get_completion_time)(
struct _cef_navigation_entry_t* self); struct _cef_navigation_entry_t* self);
/// ///
// Returns the HTTP status code for the last known successful navigation /// Returns the HTTP status code for the last known successful navigation
// response. May be 0 if the response has not yet been received or if the /// response. May be 0 if the response has not yet been received or if the
// navigation has not yet completed. /// navigation has not yet completed.
/// ///
int(CEF_CALLBACK* get_http_status_code)(struct _cef_navigation_entry_t* self); int(CEF_CALLBACK* get_http_status_code)(struct _cef_navigation_entry_t* self);
/// ///
// Returns the SSL information for this navigation entry. /// Returns the SSL information for this navigation entry.
/// ///
struct _cef_sslstatus_t*(CEF_CALLBACK* get_sslstatus)( struct _cef_sslstatus_t*(CEF_CALLBACK* get_sslstatus)(
struct _cef_navigation_entry_t* self); struct _cef_navigation_entry_t* self);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=26fdd1f18f30d9e2a48aeeb5c69607d9d22d69ca$ // $hash=a40860835e6e693ed2f85eab5fa7990b7f2c7bbe$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_ORIGIN_WHITELIST_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_ORIGIN_WHITELIST_CAPI_H_
@ -47,40 +47,41 @@ extern "C" {
#endif #endif
/// ///
// Add an entry to the cross-origin access whitelist. /// Add an entry to the cross-origin access whitelist.
// ///
// The same-origin policy restricts how scripts hosted from different origins /// The same-origin policy restricts how scripts hosted from different origins
// (scheme + domain + port) can communicate. By default, scripts can only access /// (scheme + domain + port) can communicate. By default, scripts can only
// resources with the same origin. Scripts hosted on the HTTP and HTTPS schemes /// access resources with the same origin. Scripts hosted on the HTTP and HTTPS
// (but no other schemes) can use the "Access-Control-Allow-Origin" header to /// schemes (but no other schemes) can use the "Access-Control-Allow-Origin"
// allow cross-origin requests. For example, https://source.example.com can make /// header to allow cross-origin requests. For example,
// XMLHttpRequest requests on http://target.example.com if the /// https://source.example.com can make XMLHttpRequest requests on
// http://target.example.com request returns an "Access-Control-Allow-Origin: /// http://target.example.com if the http://target.example.com request returns
// https://source.example.com" response header. /// an "Access-Control-Allow-Origin: https://source.example.com" response
// /// header.
// Scripts in separate frames or iframes and hosted from the same protocol and ///
// domain suffix can execute cross-origin JavaScript if both pages set the /// Scripts in separate frames or iframes and hosted from the same protocol and
// document.domain value to the same domain suffix. For example, /// domain suffix can execute cross-origin JavaScript if both pages set the
// scheme://foo.example.com and scheme://bar.example.com can communicate using /// document.domain value to the same domain suffix. For example,
// JavaScript if both domains set document.domain="example.com". /// scheme://foo.example.com and scheme://bar.example.com can communicate using
// /// JavaScript if both domains set document.domain="example.com".
// This function is used to allow access to origins that would otherwise violate ///
// the same-origin policy. Scripts hosted underneath the fully qualified /// This function is used to allow access to origins that would otherwise
// |source_origin| URL (like http://www.example.com) will be allowed access to /// violate the same-origin policy. Scripts hosted underneath the fully
// all resources hosted on the specified |target_protocol| and |target_domain|. /// qualified |source_origin| URL (like http://www.example.com) will be allowed
// If |target_domain| is non-NULL and |allow_target_subdomains| if false (0) /// access to all resources hosted on the specified |target_protocol| and
// only exact domain matches will be allowed. If |target_domain| contains a top- /// |target_domain|. If |target_domain| is non-NULL and
// level domain component (like "example.com") and |allow_target_subdomains| is /// |allow_target_subdomains| if false (0) only exact domain matches will be
// true (1) sub-domain matches will be allowed. If |target_domain| is NULL and /// allowed. If |target_domain| contains a top- level domain component (like
// |allow_target_subdomains| if true (1) all domains and IP addresses will be /// "example.com") and |allow_target_subdomains| is true (1) sub-domain matches
// allowed. /// will be allowed. If |target_domain| is NULL and |allow_target_subdomains| if
// /// true (1) all domains and IP addresses will be allowed.
// This function cannot be used to bypass the restrictions on local or display ///
// isolated schemes. See the comments on CefRegisterCustomScheme for more /// This function cannot be used to bypass the restrictions on local or display
// information. /// isolated schemes. See the comments on CefRegisterCustomScheme for more
// /// information.
// This function may be called on any thread. Returns false (0) if ///
// |source_origin| is invalid or the whitelist cannot be accessed. /// This function may be called on any thread. Returns false (0) if
/// |source_origin| is invalid or the whitelist cannot be accessed.
/// ///
CEF_EXPORT int cef_add_cross_origin_whitelist_entry( CEF_EXPORT int cef_add_cross_origin_whitelist_entry(
const cef_string_t* source_origin, const cef_string_t* source_origin,
@ -89,8 +90,8 @@ CEF_EXPORT int cef_add_cross_origin_whitelist_entry(
int allow_target_subdomains); int allow_target_subdomains);
/// ///
// Remove an entry from the cross-origin access whitelist. Returns false (0) if /// Remove an entry from the cross-origin access whitelist. Returns false (0) if
// |source_origin| is invalid or the whitelist cannot be accessed. /// |source_origin| is invalid or the whitelist cannot be accessed.
/// ///
CEF_EXPORT int cef_remove_cross_origin_whitelist_entry( CEF_EXPORT int cef_remove_cross_origin_whitelist_entry(
const cef_string_t* source_origin, const cef_string_t* source_origin,
@ -99,8 +100,8 @@ CEF_EXPORT int cef_remove_cross_origin_whitelist_entry(
int allow_target_subdomains); int allow_target_subdomains);
/// ///
// Remove all entries from the cross-origin access whitelist. Returns false (0) /// Remove all entries from the cross-origin access whitelist. Returns false (0)
// if the whitelist cannot be accessed. /// if the whitelist cannot be accessed.
/// ///
CEF_EXPORT int cef_clear_cross_origin_whitelist(void); CEF_EXPORT int cef_clear_cross_origin_whitelist(void);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=f5e1c0fc43c6e85dbafa66975d9dc5e2bc7be69f$ // $hash=a6cb0abd77320cfd9ddfa3f16ca0a6ff3987521a$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_PARSER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_PARSER_CAPI_H_
@ -47,84 +47,84 @@ extern "C" {
#endif #endif
/// ///
// Parse the specified |url| into its component parts. Returns false (0) if the /// Parse the specified |url| into its component parts. Returns false (0) if the
// URL is NULL or invalid. /// URL is NULL or invalid.
/// ///
CEF_EXPORT int cef_parse_url(const cef_string_t* url, CEF_EXPORT int cef_parse_url(const cef_string_t* url,
struct _cef_urlparts_t* parts); struct _cef_urlparts_t* parts);
/// ///
// Creates a URL from the specified |parts|, which must contain a non-NULL spec /// Creates a URL from the specified |parts|, which must contain a non-NULL spec
// or a non-NULL host and path (at a minimum), but not both. Returns false (0) /// or a non-NULL host and path (at a minimum), but not both. Returns false (0)
// if |parts| isn't initialized as described. /// if |parts| isn't initialized as described.
/// ///
CEF_EXPORT int cef_create_url(const struct _cef_urlparts_t* parts, CEF_EXPORT int cef_create_url(const struct _cef_urlparts_t* parts,
cef_string_t* url); cef_string_t* url);
/// ///
// This is a convenience function for formatting a URL in a concise and human- /// This is a convenience function for formatting a URL in a concise and human-
// friendly way to help users make security-related decisions (or in other /// friendly way to help users make security-related decisions (or in other
// circumstances when people need to distinguish sites, origins, or otherwise- /// circumstances when people need to distinguish sites, origins, or otherwise-
// simplified URLs from each other). Internationalized domain names (IDN) may be /// simplified URLs from each other). Internationalized domain names (IDN) may
// presented in Unicode if the conversion is considered safe. The returned value /// be presented in Unicode if the conversion is considered safe. The returned
// will (a) omit the path for standard schemes, excepting file and filesystem, /// value will (a) omit the path for standard schemes, excepting file and
// and (b) omit the port if it is the default for the scheme. Do not use this /// filesystem, and (b) omit the port if it is the default for the scheme. Do
// for URLs which will be parsed or sent to other applications. /// not use this for URLs which will be parsed or sent to other applications.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
CEF_EXPORT cef_string_userfree_t CEF_EXPORT cef_string_userfree_t
cef_format_url_for_security_display(const cef_string_t* origin_url); cef_format_url_for_security_display(const cef_string_t* origin_url);
/// ///
// Returns the mime type for the specified file extension or an NULL string if /// Returns the mime type for the specified file extension or an NULL string if
// unknown. /// unknown.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
CEF_EXPORT cef_string_userfree_t CEF_EXPORT cef_string_userfree_t
cef_get_mime_type(const cef_string_t* extension); cef_get_mime_type(const cef_string_t* extension);
/// ///
// Get the extensions associated with the given mime type. This should be passed /// Get the extensions associated with the given mime type. This should be
// in lower case. There could be multiple extensions for a given mime type, like /// passed in lower case. There could be multiple extensions for a given mime
// "html,htm" for "text/html", or "txt,text,html,..." for "text/*". Any existing /// type, like "html,htm" for "text/html", or "txt,text,html,..." for "text/*".
// elements in the provided vector will not be erased. /// Any existing elements in the provided vector will not be erased.
/// ///
CEF_EXPORT void cef_get_extensions_for_mime_type(const cef_string_t* mime_type, CEF_EXPORT void cef_get_extensions_for_mime_type(const cef_string_t* mime_type,
cef_string_list_t extensions); cef_string_list_t extensions);
/// ///
// Encodes |data| as a base64 string. /// Encodes |data| as a base64 string.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
CEF_EXPORT cef_string_userfree_t cef_base64encode(const void* data, CEF_EXPORT cef_string_userfree_t cef_base64encode(const void* data,
size_t data_size); size_t data_size);
/// ///
// Decodes the base64 encoded string |data|. The returned value will be NULL if /// Decodes the base64 encoded string |data|. The returned value will be NULL if
// the decoding fails. /// the decoding fails.
/// ///
CEF_EXPORT struct _cef_binary_value_t* cef_base64decode( CEF_EXPORT struct _cef_binary_value_t* cef_base64decode(
const cef_string_t* data); const cef_string_t* data);
/// ///
// Escapes characters in |text| which are unsuitable for use as a query /// Escapes characters in |text| which are unsuitable for use as a query
// parameter value. Everything except alphanumerics and -_.!~*'() will be /// parameter value. Everything except alphanumerics and -_.!~*'() will be
// converted to "%XX". If |use_plus| is true (1) spaces will change to "+". The /// converted to "%XX". If |use_plus| is true (1) spaces will change to "+". The
// result is basically the same as encodeURIComponent in Javacript. /// result is basically the same as encodeURIComponent in Javacript.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
CEF_EXPORT cef_string_userfree_t cef_uriencode(const cef_string_t* text, CEF_EXPORT cef_string_userfree_t cef_uriencode(const cef_string_t* text,
int use_plus); int use_plus);
/// ///
// Unescapes |text| and returns the result. Unescaping consists of looking for /// Unescapes |text| and returns the result. Unescaping consists of looking for
// the exact pattern "%XX" where each X is a hex digit and converting to the /// the exact pattern "%XX" where each X is a hex digit and converting to the
// character with the numerical value of those digits (e.g. "i%20=%203%3b" /// character with the numerical value of those digits (e.g. "i%20=%203%3b"
// unescapes to "i = 3;"). If |convert_to_utf8| is true (1) this function will /// unescapes to "i = 3;"). If |convert_to_utf8| is true (1) this function will
// attempt to interpret the initial decoded result as UTF-8. If the result is /// attempt to interpret the initial decoded result as UTF-8. If the result is
// convertable into UTF-8 it will be returned as converted. Otherwise the /// convertable into UTF-8 it will be returned as converted. Otherwise the
// initial decoded result will be returned. The |unescape_rule| parameter /// initial decoded result will be returned. The |unescape_rule| parameter
// supports further customization the decoding process. /// supports further customization the decoding process.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
CEF_EXPORT cef_string_userfree_t CEF_EXPORT cef_string_userfree_t
@ -133,17 +133,17 @@ cef_uridecode(const cef_string_t* text,
cef_uri_unescape_rule_t unescape_rule); cef_uri_unescape_rule_t unescape_rule);
/// ///
// Parses the specified |json_string| and returns a dictionary or list /// Parses the specified |json_string| and returns a dictionary or list
// representation. If JSON parsing fails this function returns NULL. /// representation. If JSON parsing fails this function returns NULL.
/// ///
CEF_EXPORT struct _cef_value_t* cef_parse_json( CEF_EXPORT struct _cef_value_t* cef_parse_json(
const cef_string_t* json_string, const cef_string_t* json_string,
cef_json_parser_options_t options); cef_json_parser_options_t options);
/// ///
// Parses the specified UTF8-encoded |json| buffer of size |json_size| and /// Parses the specified UTF8-encoded |json| buffer of size |json_size| and
// returns a dictionary or list representation. If JSON parsing fails this /// returns a dictionary or list representation. If JSON parsing fails this
// function returns NULL. /// function returns NULL.
/// ///
CEF_EXPORT struct _cef_value_t* cef_parse_json_buffer( CEF_EXPORT struct _cef_value_t* cef_parse_json_buffer(
const void* json, const void* json,
@ -151,9 +151,9 @@ CEF_EXPORT struct _cef_value_t* cef_parse_json_buffer(
cef_json_parser_options_t options); cef_json_parser_options_t options);
/// ///
// Parses the specified |json_string| and returns a dictionary or list /// Parses the specified |json_string| and returns a dictionary or list
// representation. If JSON parsing fails this function returns NULL and /// representation. If JSON parsing fails this function returns NULL and
// populates |error_msg_out| with a formatted error message. /// populates |error_msg_out| with a formatted error message.
/// ///
CEF_EXPORT struct _cef_value_t* cef_parse_jsonand_return_error( CEF_EXPORT struct _cef_value_t* cef_parse_jsonand_return_error(
const cef_string_t* json_string, const cef_string_t* json_string,
@ -161,9 +161,9 @@ CEF_EXPORT struct _cef_value_t* cef_parse_jsonand_return_error(
cef_string_t* error_msg_out); cef_string_t* error_msg_out);
/// ///
// Generates a JSON string from the specified root |node| which should be a /// Generates a JSON string from the specified root |node| which should be a
// dictionary or list value. Returns an NULL string on failure. This function /// dictionary or list value. Returns an NULL string on failure. This function
// requires exclusive access to |node| including any underlying data. /// requires exclusive access to |node| including any underlying data.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
CEF_EXPORT cef_string_userfree_t CEF_EXPORT cef_string_userfree_t

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=41ddd04d4efb147b05eb93816af1591ec3b61b76$ // $hash=0b3af613a60e4c74ec83c0bb8f5280464cbe7f48$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_PATH_UTIL_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_PATH_UTIL_CAPI_H_
@ -47,8 +47,8 @@ extern "C" {
#endif #endif
/// ///
// Retrieve the path associated with the specified |key|. Returns true (1) on /// Retrieve the path associated with the specified |key|. Returns true (1) on
// success. Can be called on any thread in the browser process. /// success. Can be called on any thread in the browser process.
/// ///
CEF_EXPORT int cef_get_path(cef_path_key_t key, cef_string_t* path); CEF_EXPORT int cef_get_path(cef_path_key_t key, cef_string_t* path);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=e902fe011f8667b64989e57ad9e72aec74b22015$ // $hash=8f2ae563306d1e4ba5fa84a5f9a60712c6fc585f$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_PERMISSION_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_PERMISSION_HANDLER_CAPI_H_
@ -48,69 +48,71 @@ extern "C" {
#endif #endif
/// ///
// Callback structure used for asynchronous continuation of media access /// Callback structure used for asynchronous continuation of media access
// permission requests. /// permission requests.
/// ///
typedef struct _cef_media_access_callback_t { typedef struct _cef_media_access_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Call to allow or deny media access. If this callback was initiated in /// Call to allow or deny media access. If this callback was initiated in
// response to a getUserMedia (indicated by /// response to a getUserMedia (indicated by
// CEF_MEDIA_PERMISSION_DEVICE_AUDIO_CAPTURE and/or /// CEF_MEDIA_PERMISSION_DEVICE_AUDIO_CAPTURE and/or
// CEF_MEDIA_PERMISSION_DEVICE_VIDEO_CAPTURE being set) then /// CEF_MEDIA_PERMISSION_DEVICE_VIDEO_CAPTURE being set) then
// |allowed_permissions| must match |required_permissions| passed to /// |allowed_permissions| must match |required_permissions| passed to
// OnRequestMediaAccessPermission. /// OnRequestMediaAccessPermission.
/// ///
void(CEF_CALLBACK* cont)(struct _cef_media_access_callback_t* self, void(CEF_CALLBACK* cont)(struct _cef_media_access_callback_t* self,
uint32 allowed_permissions); uint32 allowed_permissions);
/// ///
// Cancel the media access request. /// Cancel the media access request.
/// ///
void(CEF_CALLBACK* cancel)(struct _cef_media_access_callback_t* self); void(CEF_CALLBACK* cancel)(struct _cef_media_access_callback_t* self);
} cef_media_access_callback_t; } cef_media_access_callback_t;
/// ///
// Callback structure used for asynchronous continuation of permission prompts. /// Callback structure used for asynchronous continuation of permission prompts.
/// ///
typedef struct _cef_permission_prompt_callback_t { typedef struct _cef_permission_prompt_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Complete the permissions request with the specified |result|. /// Complete the permissions request with the specified |result|.
/// ///
void(CEF_CALLBACK* cont)(struct _cef_permission_prompt_callback_t* self, void(CEF_CALLBACK* cont)(struct _cef_permission_prompt_callback_t* self,
cef_permission_request_result_t result); cef_permission_request_result_t result);
} cef_permission_prompt_callback_t; } cef_permission_prompt_callback_t;
/// ///
// Implement this structure to handle events related to permission requests. The /// Implement this structure to handle events related to permission requests.
// functions of this structure will be called on the browser process UI thread. /// The functions of this structure will be called on the browser process UI
/// thread.
/// ///
typedef struct _cef_permission_handler_t { typedef struct _cef_permission_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called when a page requests permission to access media. |requesting_origin| /// Called when a page requests permission to access media.
// is the URL origin requesting permission. |requested_permissions| is a /// |requesting_origin| is the URL origin requesting permission.
// combination of values from cef_media_access_permission_types_t that /// |requested_permissions| is a combination of values from
// represent the requested permissions. Return true (1) and call /// cef_media_access_permission_types_t that represent the requested
// cef_media_access_callback_t functions either in this function or at a later /// permissions. Return true (1) and call cef_media_access_callback_t
// time to continue or cancel the request. Return false (0) to proceed with /// functions either in this function or at a later time to continue or cancel
// default handling. With the Chrome runtime, default handling will display /// the request. Return false (0) to proceed with default handling. With the
// the permission request UI. With the Alloy runtime, default handling will /// Chrome runtime, default handling will display the permission request UI.
// deny the request. This function will not be called if the "--enable-media- /// With the Alloy runtime, default handling will deny the request. This
// stream" command-line switch is used to grant all permissions. /// function will not be called if the "--enable-media-stream" command-line
/// switch is used to grant all permissions.
/// ///
int(CEF_CALLBACK* on_request_media_access_permission)( int(CEF_CALLBACK* on_request_media_access_permission)(
struct _cef_permission_handler_t* self, struct _cef_permission_handler_t* self,
@ -121,15 +123,15 @@ typedef struct _cef_permission_handler_t {
struct _cef_media_access_callback_t* callback); struct _cef_media_access_callback_t* callback);
/// ///
// Called when a page should show a permission prompt. |prompt_id| uniquely /// Called when a page should show a permission prompt. |prompt_id| uniquely
// identifies the prompt. |requesting_origin| is the URL origin requesting /// identifies the prompt. |requesting_origin| is the URL origin requesting
// permission. |requested_permissions| is a combination of values from /// permission. |requested_permissions| is a combination of values from
// cef_permission_request_types_t that represent the requested permissions. /// cef_permission_request_types_t that represent the requested permissions.
// Return true (1) and call cef_permission_prompt_callback_t::Continue either /// Return true (1) and call cef_permission_prompt_callback_t::Continue either
// in this function or at a later time to continue or cancel the request. /// in this function or at a later time to continue or cancel the request.
// Return false (0) to proceed with default handling. With the Chrome runtime, /// Return false (0) to proceed with default handling. With the Chrome
// default handling will display the permission prompt UI. With the Alloy /// runtime, default handling will display the permission prompt UI. With the
// runtime, default handling is CEF_PERMISSION_RESULT_IGNORE. /// Alloy runtime, default handling is CEF_PERMISSION_RESULT_IGNORE.
/// ///
int(CEF_CALLBACK* on_show_permission_prompt)( int(CEF_CALLBACK* on_show_permission_prompt)(
struct _cef_permission_handler_t* self, struct _cef_permission_handler_t* self,
@ -140,13 +142,13 @@ typedef struct _cef_permission_handler_t {
struct _cef_permission_prompt_callback_t* callback); struct _cef_permission_prompt_callback_t* callback);
/// ///
// Called when a permission prompt handled via OnShowPermissionPrompt is /// Called when a permission prompt handled via OnShowPermissionPrompt is
// dismissed. |prompt_id| will match the value that was passed to /// dismissed. |prompt_id| will match the value that was passed to
// OnShowPermissionPrompt. |result| will be the value passed to /// OnShowPermissionPrompt. |result| will be the value passed to
// cef_permission_prompt_callback_t::Continue or CEF_PERMISSION_RESULT_IGNORE /// cef_permission_prompt_callback_t::Continue or CEF_PERMISSION_RESULT_IGNORE
// if the dialog was dismissed for other reasons such as navigation, browser /// if the dialog was dismissed for other reasons such as navigation, browser
// closure, etc. This function will not be called if OnShowPermissionPrompt /// closure, etc. This function will not be called if OnShowPermissionPrompt
// returned false (0) for |prompt_id|. /// returned false (0) for |prompt_id|.
/// ///
void(CEF_CALLBACK* on_dismiss_permission_prompt)( void(CEF_CALLBACK* on_dismiss_permission_prompt)(
struct _cef_permission_handler_t* self, struct _cef_permission_handler_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=e26be3efc18d8c79d019c02b1d73a7ec2866b142$ // $hash=0621c349d0ef1e5befe0dc653a5b8ba49e51a54e$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_PRINT_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_PRINT_HANDLER_CAPI_H_
@ -49,65 +49,66 @@ extern "C" {
#endif #endif
/// ///
// Callback structure for asynchronous continuation of print dialog requests. /// Callback structure for asynchronous continuation of print dialog requests.
/// ///
typedef struct _cef_print_dialog_callback_t { typedef struct _cef_print_dialog_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Continue printing with the specified |settings|. /// Continue printing with the specified |settings|.
/// ///
void(CEF_CALLBACK* cont)(struct _cef_print_dialog_callback_t* self, void(CEF_CALLBACK* cont)(struct _cef_print_dialog_callback_t* self,
struct _cef_print_settings_t* settings); struct _cef_print_settings_t* settings);
/// ///
// Cancel the printing. /// Cancel the printing.
/// ///
void(CEF_CALLBACK* cancel)(struct _cef_print_dialog_callback_t* self); void(CEF_CALLBACK* cancel)(struct _cef_print_dialog_callback_t* self);
} cef_print_dialog_callback_t; } cef_print_dialog_callback_t;
/// ///
// Callback structure for asynchronous continuation of print job requests. /// Callback structure for asynchronous continuation of print job requests.
/// ///
typedef struct _cef_print_job_callback_t { typedef struct _cef_print_job_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Indicate completion of the print job. /// Indicate completion of the print job.
/// ///
void(CEF_CALLBACK* cont)(struct _cef_print_job_callback_t* self); void(CEF_CALLBACK* cont)(struct _cef_print_job_callback_t* self);
} cef_print_job_callback_t; } cef_print_job_callback_t;
/// ///
// Implement this structure to handle printing on Linux. Each browser will have /// Implement this structure to handle printing on Linux. Each browser will have
// only one print job in progress at a time. The functions of this structure /// only one print job in progress at a time. The functions of this structure
// will be called on the browser process UI thread. /// will be called on the browser process UI thread.
/// ///
typedef struct _cef_print_handler_t { typedef struct _cef_print_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called when printing has started for the specified |browser|. This function /// Called when printing has started for the specified |browser|. This
// will be called before the other OnPrint*() functions and irrespective of /// function will be called before the other OnPrint*() functions and
// how printing was initiated (e.g. cef_browser_host_t::print(), JavaScript /// irrespective of how printing was initiated (e.g.
// window.print() or PDF extension print button). /// cef_browser_host_t::print(), JavaScript window.print() or PDF extension
/// print button).
/// ///
void(CEF_CALLBACK* on_print_start)(struct _cef_print_handler_t* self, void(CEF_CALLBACK* on_print_start)(struct _cef_print_handler_t* self,
struct _cef_browser_t* browser); struct _cef_browser_t* browser);
/// ///
// Synchronize |settings| with client state. If |get_defaults| is true (1) /// Synchronize |settings| with client state. If |get_defaults| is true (1)
// then populate |settings| with the default print settings. Do not keep a /// then populate |settings| with the default print settings. Do not keep a
// reference to |settings| outside of this callback. /// reference to |settings| outside of this callback.
/// ///
void(CEF_CALLBACK* on_print_settings)(struct _cef_print_handler_t* self, void(CEF_CALLBACK* on_print_settings)(struct _cef_print_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -115,9 +116,9 @@ typedef struct _cef_print_handler_t {
int get_defaults); int get_defaults);
/// ///
// Show the print dialog. Execute |callback| once the dialog is dismissed. /// Show the print dialog. Execute |callback| once the dialog is dismissed.
// Return true (1) if the dialog will be displayed or false (0) to cancel the /// Return true (1) if the dialog will be displayed or false (0) to cancel the
// printing immediately. /// printing immediately.
/// ///
int(CEF_CALLBACK* on_print_dialog)( int(CEF_CALLBACK* on_print_dialog)(
struct _cef_print_handler_t* self, struct _cef_print_handler_t* self,
@ -126,9 +127,9 @@ typedef struct _cef_print_handler_t {
struct _cef_print_dialog_callback_t* callback); struct _cef_print_dialog_callback_t* callback);
/// ///
// Send the print job to the printer. Execute |callback| once the job is /// Send the print job to the printer. Execute |callback| once the job is
// completed. Return true (1) if the job will proceed or false (0) to cancel /// completed. Return true (1) if the job will proceed or false (0) to cancel
// the job immediately. /// the job immediately.
/// ///
int(CEF_CALLBACK* on_print_job)(struct _cef_print_handler_t* self, int(CEF_CALLBACK* on_print_job)(struct _cef_print_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -137,14 +138,14 @@ typedef struct _cef_print_handler_t {
struct _cef_print_job_callback_t* callback); struct _cef_print_job_callback_t* callback);
/// ///
// Reset client state related to printing. /// Reset client state related to printing.
/// ///
void(CEF_CALLBACK* on_print_reset)(struct _cef_print_handler_t* self, void(CEF_CALLBACK* on_print_reset)(struct _cef_print_handler_t* self,
struct _cef_browser_t* browser); struct _cef_browser_t* browser);
/// ///
// Return the PDF paper size in device units. Used in combination with /// Return the PDF paper size in device units. Used in combination with
// cef_browser_host_t::print_to_pdf(). /// cef_browser_host_t::print_to_pdf().
/// ///
cef_size_t(CEF_CALLBACK* get_pdf_paper_size)( cef_size_t(CEF_CALLBACK* get_pdf_paper_size)(
struct _cef_print_handler_t* self, struct _cef_print_handler_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=1a9b9718367ec8d575fbb39b73b1085b17eb0a2b$ // $hash=22959da4d5a2c94edc7647334507e38c44d40250$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_PRINT_SETTINGS_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_PRINT_SETTINGS_CAPI_H_
@ -47,41 +47,41 @@ extern "C" {
#endif #endif
/// ///
// Structure representing print settings. /// Structure representing print settings.
/// ///
typedef struct _cef_print_settings_t { typedef struct _cef_print_settings_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is valid. Do not call any other functions /// Returns true (1) if this object is valid. Do not call any other functions
// if this function returns false (0). /// if this function returns false (0).
/// ///
int(CEF_CALLBACK* is_valid)(struct _cef_print_settings_t* self); int(CEF_CALLBACK* is_valid)(struct _cef_print_settings_t* self);
/// ///
// Returns true (1) if the values of this object are read-only. Some APIs may /// Returns true (1) if the values of this object are read-only. Some APIs may
// expose read-only objects. /// expose read-only objects.
/// ///
int(CEF_CALLBACK* is_read_only)(struct _cef_print_settings_t* self); int(CEF_CALLBACK* is_read_only)(struct _cef_print_settings_t* self);
/// ///
// Set the page orientation. /// Set the page orientation.
/// ///
void(CEF_CALLBACK* set_orientation)(struct _cef_print_settings_t* self, void(CEF_CALLBACK* set_orientation)(struct _cef_print_settings_t* self,
int landscape); int landscape);
/// ///
// Returns true (1) if the orientation is landscape. /// Returns true (1) if the orientation is landscape.
/// ///
int(CEF_CALLBACK* is_landscape)(struct _cef_print_settings_t* self); int(CEF_CALLBACK* is_landscape)(struct _cef_print_settings_t* self);
/// ///
// Set the printer printable area in device units. Some platforms already /// Set the printer printable area in device units. Some platforms already
// provide flipped area. Set |landscape_needs_flip| to false (0) on those /// provide flipped area. Set |landscape_needs_flip| to false (0) on those
// platforms to avoid double flipping. /// platforms to avoid double flipping.
/// ///
void(CEF_CALLBACK* set_printer_printable_area)( void(CEF_CALLBACK* set_printer_printable_area)(
struct _cef_print_settings_t* self, struct _cef_print_settings_t* self,
@ -90,108 +90,108 @@ typedef struct _cef_print_settings_t {
int landscape_needs_flip); int landscape_needs_flip);
/// ///
// Set the device name. /// Set the device name.
/// ///
void(CEF_CALLBACK* set_device_name)(struct _cef_print_settings_t* self, void(CEF_CALLBACK* set_device_name)(struct _cef_print_settings_t* self,
const cef_string_t* name); const cef_string_t* name);
/// ///
// Get the device name. /// Get the device name.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_device_name)( cef_string_userfree_t(CEF_CALLBACK* get_device_name)(
struct _cef_print_settings_t* self); struct _cef_print_settings_t* self);
/// ///
// Set the DPI (dots per inch). /// Set the DPI (dots per inch).
/// ///
void(CEF_CALLBACK* set_dpi)(struct _cef_print_settings_t* self, int dpi); void(CEF_CALLBACK* set_dpi)(struct _cef_print_settings_t* self, int dpi);
/// ///
// Get the DPI (dots per inch). /// Get the DPI (dots per inch).
/// ///
int(CEF_CALLBACK* get_dpi)(struct _cef_print_settings_t* self); int(CEF_CALLBACK* get_dpi)(struct _cef_print_settings_t* self);
/// ///
// Set the page ranges. /// Set the page ranges.
/// ///
void(CEF_CALLBACK* set_page_ranges)(struct _cef_print_settings_t* self, void(CEF_CALLBACK* set_page_ranges)(struct _cef_print_settings_t* self,
size_t rangesCount, size_t rangesCount,
cef_range_t const* ranges); cef_range_t const* ranges);
/// ///
// Returns the number of page ranges that currently exist. /// Returns the number of page ranges that currently exist.
/// ///
size_t(CEF_CALLBACK* get_page_ranges_count)( size_t(CEF_CALLBACK* get_page_ranges_count)(
struct _cef_print_settings_t* self); struct _cef_print_settings_t* self);
/// ///
// Retrieve the page ranges. /// Retrieve the page ranges.
/// ///
void(CEF_CALLBACK* get_page_ranges)(struct _cef_print_settings_t* self, void(CEF_CALLBACK* get_page_ranges)(struct _cef_print_settings_t* self,
size_t* rangesCount, size_t* rangesCount,
cef_range_t* ranges); cef_range_t* ranges);
/// ///
// Set whether only the selection will be printed. /// Set whether only the selection will be printed.
/// ///
void(CEF_CALLBACK* set_selection_only)(struct _cef_print_settings_t* self, void(CEF_CALLBACK* set_selection_only)(struct _cef_print_settings_t* self,
int selection_only); int selection_only);
/// ///
// Returns true (1) if only the selection will be printed. /// Returns true (1) if only the selection will be printed.
/// ///
int(CEF_CALLBACK* is_selection_only)(struct _cef_print_settings_t* self); int(CEF_CALLBACK* is_selection_only)(struct _cef_print_settings_t* self);
/// ///
// Set whether pages will be collated. /// Set whether pages will be collated.
/// ///
void(CEF_CALLBACK* set_collate)(struct _cef_print_settings_t* self, void(CEF_CALLBACK* set_collate)(struct _cef_print_settings_t* self,
int collate); int collate);
/// ///
// Returns true (1) if pages will be collated. /// Returns true (1) if pages will be collated.
/// ///
int(CEF_CALLBACK* will_collate)(struct _cef_print_settings_t* self); int(CEF_CALLBACK* will_collate)(struct _cef_print_settings_t* self);
/// ///
// Set the color model. /// Set the color model.
/// ///
void(CEF_CALLBACK* set_color_model)(struct _cef_print_settings_t* self, void(CEF_CALLBACK* set_color_model)(struct _cef_print_settings_t* self,
cef_color_model_t model); cef_color_model_t model);
/// ///
// Get the color model. /// Get the color model.
/// ///
cef_color_model_t(CEF_CALLBACK* get_color_model)( cef_color_model_t(CEF_CALLBACK* get_color_model)(
struct _cef_print_settings_t* self); struct _cef_print_settings_t* self);
/// ///
// Set the number of copies. /// Set the number of copies.
/// ///
void(CEF_CALLBACK* set_copies)(struct _cef_print_settings_t* self, void(CEF_CALLBACK* set_copies)(struct _cef_print_settings_t* self,
int copies); int copies);
/// ///
// Get the number of copies. /// Get the number of copies.
/// ///
int(CEF_CALLBACK* get_copies)(struct _cef_print_settings_t* self); int(CEF_CALLBACK* get_copies)(struct _cef_print_settings_t* self);
/// ///
// Set the duplex mode. /// Set the duplex mode.
/// ///
void(CEF_CALLBACK* set_duplex_mode)(struct _cef_print_settings_t* self, void(CEF_CALLBACK* set_duplex_mode)(struct _cef_print_settings_t* self,
cef_duplex_mode_t mode); cef_duplex_mode_t mode);
/// ///
// Get the duplex mode. /// Get the duplex mode.
/// ///
cef_duplex_mode_t(CEF_CALLBACK* get_duplex_mode)( cef_duplex_mode_t(CEF_CALLBACK* get_duplex_mode)(
struct _cef_print_settings_t* self); struct _cef_print_settings_t* self);
} cef_print_settings_t; } cef_print_settings_t;
/// ///
// Create a new cef_print_settings_t object. /// Create a new cef_print_settings_t object.
/// ///
CEF_EXPORT cef_print_settings_t* cef_print_settings_create(void); CEF_EXPORT cef_print_settings_t* cef_print_settings_create(void);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=026a7f827962222a1df8b62a8e7bdfbf4dce27e0$ // $hash=7b8bbe145aa8d54d868b9d9e4ce6ff2e6a596e53$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_PROCESS_MESSAGE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_PROCESS_MESSAGE_CAPI_H_
@ -49,57 +49,57 @@ extern "C" {
#endif #endif
/// ///
// Structure representing a message. Can be used on any process and thread. /// Structure representing a message. Can be used on any process and thread.
/// ///
typedef struct _cef_process_message_t { typedef struct _cef_process_message_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is valid. Do not call any other functions /// Returns true (1) if this object is valid. Do not call any other functions
// if this function returns false (0). /// if this function returns false (0).
/// ///
int(CEF_CALLBACK* is_valid)(struct _cef_process_message_t* self); int(CEF_CALLBACK* is_valid)(struct _cef_process_message_t* self);
/// ///
// Returns true (1) if the values of this object are read-only. Some APIs may /// Returns true (1) if the values of this object are read-only. Some APIs may
// expose read-only objects. /// expose read-only objects.
/// ///
int(CEF_CALLBACK* is_read_only)(struct _cef_process_message_t* self); int(CEF_CALLBACK* is_read_only)(struct _cef_process_message_t* self);
/// ///
// Returns a writable copy of this object. Returns nullptr when message /// Returns a writable copy of this object. Returns nullptr when message
// contains a shared memory region. /// contains a shared memory region.
/// ///
struct _cef_process_message_t*(CEF_CALLBACK* copy)( struct _cef_process_message_t*(CEF_CALLBACK* copy)(
struct _cef_process_message_t* self); struct _cef_process_message_t* self);
/// ///
// Returns the message name. /// Returns the message name.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_name)( cef_string_userfree_t(CEF_CALLBACK* get_name)(
struct _cef_process_message_t* self); struct _cef_process_message_t* self);
/// ///
// Returns the list of arguments. Returns nullptr when message contains a /// Returns the list of arguments. Returns nullptr when message contains a
// shared memory region. /// shared memory region.
/// ///
struct _cef_list_value_t*(CEF_CALLBACK* get_argument_list)( struct _cef_list_value_t*(CEF_CALLBACK* get_argument_list)(
struct _cef_process_message_t* self); struct _cef_process_message_t* self);
/// ///
// Returns the shared memory region. Returns nullptr when message contains an /// Returns the shared memory region. Returns nullptr when message contains an
// argument list. /// argument list.
/// ///
struct _cef_shared_memory_region_t*(CEF_CALLBACK* get_shared_memory_region)( struct _cef_shared_memory_region_t*(CEF_CALLBACK* get_shared_memory_region)(
struct _cef_process_message_t* self); struct _cef_process_message_t* self);
} cef_process_message_t; } cef_process_message_t;
/// ///
// Create a new cef_process_message_t object with the specified name. /// Create a new cef_process_message_t object with the specified name.
/// ///
CEF_EXPORT cef_process_message_t* cef_process_message_create( CEF_EXPORT cef_process_message_t* cef_process_message_create(
const cef_string_t* name); const cef_string_t* name);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=1f2b752c4e314b240ce95cb3b87863c2f99534a8$ // $hash=f6b215445a54f565a26f1a62d2671156635d6d46$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_PROCESS_UTIL_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_PROCESS_UTIL_CAPI_H_
@ -47,14 +47,14 @@ extern "C" {
#endif #endif
/// ///
// Launches the process specified via |command_line|. Returns true (1) upon /// Launches the process specified via |command_line|. Returns true (1) upon
// success. Must be called on the browser process TID_PROCESS_LAUNCHER thread. /// success. Must be called on the browser process TID_PROCESS_LAUNCHER thread.
// ///
// Unix-specific notes: - All file descriptors open in the parent process will /// Unix-specific notes: - All file descriptors open in the parent process will
// be closed in the /// be closed in the
// child process except for stdin, stdout, and stderr. /// child process except for stdin, stdout, and stderr.
// - If the first argument on the command line does not contain a slash, /// - If the first argument on the command line does not contain a slash,
// PATH will be searched. (See man execvp.) /// PATH will be searched. (See man execvp.)
/// ///
CEF_EXPORT int cef_launch_process(struct _cef_command_line_t* command_line); CEF_EXPORT int cef_launch_process(struct _cef_command_line_t* command_line);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=d5efa37953d0f0097fef20bc18f4938621c6b168$ // $hash=28371116427e9457ea366c9f0546cd5eefd8f08a$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_REGISTRATION_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_REGISTRATION_CAPI_H_
@ -47,11 +47,11 @@ extern "C" {
#endif #endif
/// ///
// Generic callback structure used for managing the lifespan of a registration. /// Generic callback structure used for managing the lifespan of a registration.
/// ///
typedef struct _cef_registration_t { typedef struct _cef_registration_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
} cef_registration_t; } cef_registration_t;

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=5f56719342d8b07cc9cd9362fc3b506f2b8a0286$ // $hash=931b329d62ea6461485b62b79f98165d7185b6e7$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_
@ -50,44 +50,44 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to handle events when window rendering is disabled. /// Implement this structure to handle events when window rendering is disabled.
// The functions of this structure will be called on the UI thread. /// The functions of this structure will be called on the UI thread.
/// ///
typedef struct _cef_render_handler_t { typedef struct _cef_render_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Return the handler for accessibility notifications. If no handler is /// Return the handler for accessibility notifications. If no handler is
// provided the default implementation will be used. /// provided the default implementation will be used.
/// ///
struct _cef_accessibility_handler_t*(CEF_CALLBACK* get_accessibility_handler)( struct _cef_accessibility_handler_t*(CEF_CALLBACK* get_accessibility_handler)(
struct _cef_render_handler_t* self); struct _cef_render_handler_t* self);
/// ///
// Called to retrieve the root window rectangle in screen DIP coordinates. /// Called to retrieve the root window rectangle in screen DIP coordinates.
// Return true (1) if the rectangle was provided. If this function returns /// Return true (1) if the rectangle was provided. If this function returns
// false (0) the rectangle from GetViewRect will be used. /// false (0) the rectangle from GetViewRect will be used.
/// ///
int(CEF_CALLBACK* get_root_screen_rect)(struct _cef_render_handler_t* self, int(CEF_CALLBACK* get_root_screen_rect)(struct _cef_render_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
cef_rect_t* rect); cef_rect_t* rect);
/// ///
// Called to retrieve the view rectangle in screen DIP coordinates. This /// Called to retrieve the view rectangle in screen DIP coordinates. This
// function must always provide a non-NULL rectangle. /// function must always provide a non-NULL rectangle.
/// ///
void(CEF_CALLBACK* get_view_rect)(struct _cef_render_handler_t* self, void(CEF_CALLBACK* get_view_rect)(struct _cef_render_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
cef_rect_t* rect); cef_rect_t* rect);
/// ///
// Called to retrieve the translation from view DIP coordinates to screen /// Called to retrieve the translation from view DIP coordinates to screen
// coordinates. Windows/Linux should provide screen device (pixel) coordinates /// coordinates. Windows/Linux should provide screen device (pixel)
// and MacOS should provide screen DIP coordinates. Return true (1) if the /// coordinates and MacOS should provide screen DIP coordinates. Return true
// requested coordinates were provided. /// (1) if the requested coordinates were provided.
/// ///
int(CEF_CALLBACK* get_screen_point)(struct _cef_render_handler_t* self, int(CEF_CALLBACK* get_screen_point)(struct _cef_render_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -97,44 +97,44 @@ typedef struct _cef_render_handler_t {
int* screenY); int* screenY);
/// ///
// Called to allow the client to fill in the CefScreenInfo object with /// Called to allow the client to fill in the CefScreenInfo object with
// appropriate values. Return true (1) if the |screen_info| structure has been /// appropriate values. Return true (1) if the |screen_info| structure has
// modified. /// been modified.
// ///
// If the screen info rectangle is left NULL the rectangle from GetViewRect /// If the screen info rectangle is left NULL the rectangle from GetViewRect
// will be used. If the rectangle is still NULL or invalid popups may not be /// will be used. If the rectangle is still NULL or invalid popups may not be
// drawn correctly. /// drawn correctly.
/// ///
int(CEF_CALLBACK* get_screen_info)(struct _cef_render_handler_t* self, int(CEF_CALLBACK* get_screen_info)(struct _cef_render_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
cef_screen_info_t* screen_info); cef_screen_info_t* screen_info);
/// ///
// Called when the browser wants to show or hide the popup widget. The popup /// Called when the browser wants to show or hide the popup widget. The popup
// should be shown if |show| is true (1) and hidden if |show| is false (0). /// should be shown if |show| is true (1) and hidden if |show| is false (0).
/// ///
void(CEF_CALLBACK* on_popup_show)(struct _cef_render_handler_t* self, void(CEF_CALLBACK* on_popup_show)(struct _cef_render_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
int show); int show);
/// ///
// Called when the browser wants to move or resize the popup widget. |rect| /// Called when the browser wants to move or resize the popup widget. |rect|
// contains the new location and size in view coordinates. /// contains the new location and size in view coordinates.
/// ///
void(CEF_CALLBACK* on_popup_size)(struct _cef_render_handler_t* self, void(CEF_CALLBACK* on_popup_size)(struct _cef_render_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
const cef_rect_t* rect); const cef_rect_t* rect);
/// ///
// Called when an element should be painted. Pixel values passed to this /// Called when an element should be painted. Pixel values passed to this
// function are scaled relative to view coordinates based on the value of /// function are scaled relative to view coordinates based on the value of
// CefScreenInfo.device_scale_factor returned from GetScreenInfo. |type| /// CefScreenInfo.device_scale_factor returned from GetScreenInfo. |type|
// indicates whether the element is the view or the popup widget. |buffer| /// indicates whether the element is the view or the popup widget. |buffer|
// contains the pixel data for the whole image. |dirtyRects| contains the set /// contains the pixel data for the whole image. |dirtyRects| contains the set
// of rectangles in pixel coordinates that need to be repainted. |buffer| will /// of rectangles in pixel coordinates that need to be repainted. |buffer|
// be |width|*|height|*4 bytes in size and represents a BGRA image with an /// will be |width|*|height|*4 bytes in size and represents a BGRA image with
// upper-left origin. This function is only called when /// an upper-left origin. This function is only called when
// cef_window_tInfo::shared_texture_enabled is set to false (0). /// cef_window_tInfo::shared_texture_enabled is set to false (0).
/// ///
void(CEF_CALLBACK* on_paint)(struct _cef_render_handler_t* self, void(CEF_CALLBACK* on_paint)(struct _cef_render_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -146,13 +146,13 @@ typedef struct _cef_render_handler_t {
int height); int height);
/// ///
// Called when an element has been rendered to the shared texture handle. /// Called when an element has been rendered to the shared texture handle.
// |type| indicates whether the element is the view or the popup widget. /// |type| indicates whether the element is the view or the popup widget.
// |dirtyRects| contains the set of rectangles in pixel coordinates that need /// |dirtyRects| contains the set of rectangles in pixel coordinates that need
// to be repainted. |shared_handle| is the handle for a D3D11 Texture2D that /// to be repainted. |shared_handle| is the handle for a D3D11 Texture2D that
// can be accessed via ID3D11Device using the OpenSharedResource function. /// can be accessed via ID3D11Device using the OpenSharedResource function.
// This function is only called when cef_window_tInfo::shared_texture_enabled /// This function is only called when cef_window_tInfo::shared_texture_enabled
// is set to true (1), and is currently only supported on Windows. /// is set to true (1), and is currently only supported on Windows.
/// ///
void(CEF_CALLBACK* on_accelerated_paint)(struct _cef_render_handler_t* self, void(CEF_CALLBACK* on_accelerated_paint)(struct _cef_render_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -162,8 +162,8 @@ typedef struct _cef_render_handler_t {
void* shared_handle); void* shared_handle);
/// ///
// Called to retrieve the size of the touch handle for the specified /// Called to retrieve the size of the touch handle for the specified
// |orientation|. /// |orientation|.
/// ///
void(CEF_CALLBACK* get_touch_handle_size)( void(CEF_CALLBACK* get_touch_handle_size)(
struct _cef_render_handler_t* self, struct _cef_render_handler_t* self,
@ -172,8 +172,8 @@ typedef struct _cef_render_handler_t {
cef_size_t* size); cef_size_t* size);
/// ///
// Called when touch handle state is updated. The client is responsible for /// Called when touch handle state is updated. The client is responsible for
// rendering the touch handles. /// rendering the touch handles.
/// ///
void(CEF_CALLBACK* on_touch_handle_state_changed)( void(CEF_CALLBACK* on_touch_handle_state_changed)(
struct _cef_render_handler_t* self, struct _cef_render_handler_t* self,
@ -181,18 +181,18 @@ typedef struct _cef_render_handler_t {
const cef_touch_handle_state_t* state); const cef_touch_handle_state_t* state);
/// ///
// Called when the user starts dragging content in the web view. Contextual /// Called when the user starts dragging content in the web view. Contextual
// information about the dragged content is supplied by |drag_data|. (|x|, /// information about the dragged content is supplied by |drag_data|. (|x|,
// |y|) is the drag start location in screen coordinates. OS APIs that run a /// |y|) is the drag start location in screen coordinates. OS APIs that run a
// system message loop may be used within the StartDragging call. /// system message loop may be used within the StartDragging call.
// ///
// Return false (0) to abort the drag operation. Don't call any of /// Return false (0) to abort the drag operation. Don't call any of
// cef_browser_host_t::DragSource*Ended* functions after returning false (0). /// cef_browser_host_t::DragSource*Ended* functions after returning false (0).
// ///
// Return true (1) to handle the drag operation. Call /// Return true (1) to handle the drag operation. Call
// cef_browser_host_t::DragSourceEndedAt and DragSourceSystemDragEnded either /// cef_browser_host_t::DragSourceEndedAt and DragSourceSystemDragEnded either
// synchronously or asynchronously to inform the web view that the drag /// synchronously or asynchronously to inform the web view that the drag
// operation has ended. /// operation has ended.
/// ///
int(CEF_CALLBACK* start_dragging)(struct _cef_render_handler_t* self, int(CEF_CALLBACK* start_dragging)(struct _cef_render_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -202,16 +202,16 @@ typedef struct _cef_render_handler_t {
int y); int y);
/// ///
// Called when the web view wants to update the mouse cursor during a drag & /// Called when the web view wants to update the mouse cursor during a drag &
// drop operation. |operation| describes the allowed operation (none, move, /// drop operation. |operation| describes the allowed operation (none, move,
// copy, link). /// copy, link).
/// ///
void(CEF_CALLBACK* update_drag_cursor)(struct _cef_render_handler_t* self, void(CEF_CALLBACK* update_drag_cursor)(struct _cef_render_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
cef_drag_operations_mask_t operation); cef_drag_operations_mask_t operation);
/// ///
// Called when the scroll offset has changed. /// Called when the scroll offset has changed.
/// ///
void(CEF_CALLBACK* on_scroll_offset_changed)( void(CEF_CALLBACK* on_scroll_offset_changed)(
struct _cef_render_handler_t* self, struct _cef_render_handler_t* self,
@ -220,9 +220,9 @@ typedef struct _cef_render_handler_t {
double y); double y);
/// ///
// Called when the IME composition range has changed. |selected_range| is the /// Called when the IME composition range has changed. |selected_range| is the
// range of characters that have been selected. |character_bounds| is the /// range of characters that have been selected. |character_bounds| is the
// bounds of each character in view coordinates. /// bounds of each character in view coordinates.
/// ///
void(CEF_CALLBACK* on_ime_composition_range_changed)( void(CEF_CALLBACK* on_ime_composition_range_changed)(
struct _cef_render_handler_t* self, struct _cef_render_handler_t* self,
@ -232,9 +232,9 @@ typedef struct _cef_render_handler_t {
cef_rect_t const* character_bounds); cef_rect_t const* character_bounds);
/// ///
// Called when text selection has changed for the specified |browser|. /// Called when text selection has changed for the specified |browser|.
// |selected_text| is the currently selected text and |selected_range| is the /// |selected_text| is the currently selected text and |selected_range| is the
// character range. /// character range.
/// ///
void(CEF_CALLBACK* on_text_selection_changed)( void(CEF_CALLBACK* on_text_selection_changed)(
struct _cef_render_handler_t* self, struct _cef_render_handler_t* self,
@ -243,10 +243,10 @@ typedef struct _cef_render_handler_t {
const cef_range_t* selected_range); const cef_range_t* selected_range);
/// ///
// Called when an on-screen keyboard should be shown or hidden for the /// Called when an on-screen keyboard should be shown or hidden for the
// specified |browser|. |input_mode| specifies what kind of keyboard should be /// specified |browser|. |input_mode| specifies what kind of keyboard should
// opened. If |input_mode| is CEF_TEXT_INPUT_MODE_NONE, any existing keyboard /// be opened. If |input_mode| is CEF_TEXT_INPUT_MODE_NONE, any existing
// for this browser should be hidden. /// keyboard for this browser should be hidden.
/// ///
void(CEF_CALLBACK* on_virtual_keyboard_requested)( void(CEF_CALLBACK* on_virtual_keyboard_requested)(
struct _cef_render_handler_t* self, struct _cef_render_handler_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=0b8abb0e55cb56fcb778ced72a61a108c2b28011$ // $hash=b74afb6f8003ed24256ce7359ea377596b4406d9$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_RENDER_PROCESS_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_RENDER_PROCESS_HANDLER_CAPI_H_
@ -54,30 +54,30 @@ extern "C" {
#endif #endif
/// ///
// Structure used to implement render process callbacks. The functions of this /// Structure used to implement render process callbacks. The functions of this
// structure will be called on the render process main thread (TID_RENDERER) /// structure will be called on the render process main thread (TID_RENDERER)
// unless otherwise indicated. /// unless otherwise indicated.
/// ///
typedef struct _cef_render_process_handler_t { typedef struct _cef_render_process_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called after WebKit has been initialized. /// Called after WebKit has been initialized.
/// ///
void(CEF_CALLBACK* on_web_kit_initialized)( void(CEF_CALLBACK* on_web_kit_initialized)(
struct _cef_render_process_handler_t* self); struct _cef_render_process_handler_t* self);
/// ///
// Called after a browser has been created. When browsing cross-origin a new /// Called after a browser has been created. When browsing cross-origin a new
// browser will be created before the old browser with the same identifier is /// browser will be created before the old browser with the same identifier is
// destroyed. |extra_info| is an optional read-only value originating from /// destroyed. |extra_info| is an optional read-only value originating from
// cef_browser_host_t::cef_browser_host_create_browser(), /// cef_browser_host_t::cef_browser_host_create_browser(),
// cef_browser_host_t::cef_browser_host_create_browser_sync(), /// cef_browser_host_t::cef_browser_host_create_browser_sync(),
// cef_life_span_handler_t::on_before_popup() or /// cef_life_span_handler_t::on_before_popup() or
// cef_browser_view_t::cef_browser_view_create(). /// cef_browser_view_t::cef_browser_view_create().
/// ///
void(CEF_CALLBACK* on_browser_created)( void(CEF_CALLBACK* on_browser_created)(
struct _cef_render_process_handler_t* self, struct _cef_render_process_handler_t* self,
@ -85,25 +85,25 @@ typedef struct _cef_render_process_handler_t {
struct _cef_dictionary_value_t* extra_info); struct _cef_dictionary_value_t* extra_info);
/// ///
// Called before a browser is destroyed. /// Called before a browser is destroyed.
/// ///
void(CEF_CALLBACK* on_browser_destroyed)( void(CEF_CALLBACK* on_browser_destroyed)(
struct _cef_render_process_handler_t* self, struct _cef_render_process_handler_t* self,
struct _cef_browser_t* browser); struct _cef_browser_t* browser);
/// ///
// Return the handler for browser load status events. /// Return the handler for browser load status events.
/// ///
struct _cef_load_handler_t*(CEF_CALLBACK* get_load_handler)( struct _cef_load_handler_t*(CEF_CALLBACK* get_load_handler)(
struct _cef_render_process_handler_t* self); struct _cef_render_process_handler_t* self);
/// ///
// Called immediately after the V8 context for a frame has been created. To /// Called immediately after the V8 context for a frame has been created. To
// retrieve the JavaScript 'window' object use the /// retrieve the JavaScript 'window' object use the
// cef_v8context_t::get_global() function. V8 handles can only be accessed /// cef_v8context_t::get_global() function. V8 handles can only be accessed
// from the thread on which they are created. A task runner for posting tasks /// from the thread on which they are created. A task runner for posting tasks
// on the associated thread can be retrieved via the /// on the associated thread can be retrieved via the
// cef_v8context_t::get_task_runner() function. /// cef_v8context_t::get_task_runner() function.
/// ///
void(CEF_CALLBACK* on_context_created)( void(CEF_CALLBACK* on_context_created)(
struct _cef_render_process_handler_t* self, struct _cef_render_process_handler_t* self,
@ -112,8 +112,8 @@ typedef struct _cef_render_process_handler_t {
struct _cef_v8context_t* context); struct _cef_v8context_t* context);
/// ///
// Called immediately before the V8 context for a frame is released. No /// Called immediately before the V8 context for a frame is released. No
// references to the context should be kept after this function is called. /// references to the context should be kept after this function is called.
/// ///
void(CEF_CALLBACK* on_context_released)( void(CEF_CALLBACK* on_context_released)(
struct _cef_render_process_handler_t* self, struct _cef_render_process_handler_t* self,
@ -122,9 +122,9 @@ typedef struct _cef_render_process_handler_t {
struct _cef_v8context_t* context); struct _cef_v8context_t* context);
/// ///
// Called for global uncaught exceptions in a frame. Execution of this /// Called for global uncaught exceptions in a frame. Execution of this
// callback is disabled by default. To enable set /// callback is disabled by default. To enable set
// CefSettings.uncaught_exception_stack_size > 0. /// cef_settings_t.uncaught_exception_stack_size > 0.
/// ///
void(CEF_CALLBACK* on_uncaught_exception)( void(CEF_CALLBACK* on_uncaught_exception)(
struct _cef_render_process_handler_t* self, struct _cef_render_process_handler_t* self,
@ -135,12 +135,12 @@ typedef struct _cef_render_process_handler_t {
struct _cef_v8stack_trace_t* stackTrace); struct _cef_v8stack_trace_t* stackTrace);
/// ///
// Called when a new node in the the browser gets focus. The |node| value may /// Called when a new node in the the browser gets focus. The |node| value may
// be NULL if no specific node has gained focus. The node object passed to /// be NULL if no specific node has gained focus. The node object passed to
// this function represents a snapshot of the DOM at the time this function is /// this function represents a snapshot of the DOM at the time this function
// executed. DOM objects are only valid for the scope of this function. Do not /// is executed. DOM objects are only valid for the scope of this function. Do
// keep references to or attempt to access any DOM objects outside the scope /// not keep references to or attempt to access any DOM objects outside the
// of this function. /// scope of this function.
/// ///
void(CEF_CALLBACK* on_focused_node_changed)( void(CEF_CALLBACK* on_focused_node_changed)(
struct _cef_render_process_handler_t* self, struct _cef_render_process_handler_t* self,
@ -149,9 +149,9 @@ typedef struct _cef_render_process_handler_t {
struct _cef_domnode_t* node); struct _cef_domnode_t* node);
/// ///
// Called when a new message is received from a different process. Return true /// Called when a new message is received from a different process. Return
// (1) if the message was handled or false (0) otherwise. It is safe to keep a /// true (1) if the message was handled or false (0) otherwise. It is safe to
// reference to |message| outside of this callback. /// keep a reference to |message| outside of this callback.
/// ///
int(CEF_CALLBACK* on_process_message_received)( int(CEF_CALLBACK* on_process_message_received)(
struct _cef_render_process_handler_t* self, struct _cef_render_process_handler_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=246d07b9790ff6bd574c59b1c237c603deaf88bf$ // $hash=041c1b4e6e57987ad547daff56f96c6ff7ab15c9$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CAPI_H_
@ -50,96 +50,96 @@ struct _cef_post_data_element_t;
struct _cef_post_data_t; struct _cef_post_data_t;
/// ///
// Structure used to represent a web request. The functions of this structure /// Structure used to represent a web request. The functions of this structure
// may be called on any thread. /// may be called on any thread.
/// ///
typedef struct _cef_request_t { typedef struct _cef_request_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is read-only. /// Returns true (1) if this object is read-only.
/// ///
int(CEF_CALLBACK* is_read_only)(struct _cef_request_t* self); int(CEF_CALLBACK* is_read_only)(struct _cef_request_t* self);
/// ///
// Get the fully qualified URL. /// Get the fully qualified URL.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_url)(struct _cef_request_t* self); cef_string_userfree_t(CEF_CALLBACK* get_url)(struct _cef_request_t* self);
/// ///
// Set the fully qualified URL. /// Set the fully qualified URL.
/// ///
void(CEF_CALLBACK* set_url)(struct _cef_request_t* self, void(CEF_CALLBACK* set_url)(struct _cef_request_t* self,
const cef_string_t* url); const cef_string_t* url);
/// ///
// Get the request function type. The value will default to POST if post data /// Get the request function type. The value will default to POST if post data
// is provided and GET otherwise. /// is provided and GET otherwise.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_method)(struct _cef_request_t* self); cef_string_userfree_t(CEF_CALLBACK* get_method)(struct _cef_request_t* self);
/// ///
// Set the request function type. /// Set the request function type.
/// ///
void(CEF_CALLBACK* set_method)(struct _cef_request_t* self, void(CEF_CALLBACK* set_method)(struct _cef_request_t* self,
const cef_string_t* method); const cef_string_t* method);
/// ///
// Set the referrer URL and policy. If non-NULL the referrer URL must be fully /// Set the referrer URL and policy. If non-NULL the referrer URL must be
// qualified with an HTTP or HTTPS scheme component. Any username, password or /// fully qualified with an HTTP or HTTPS scheme component. Any username,
// ref component will be removed. /// password or ref component will be removed.
/// ///
void(CEF_CALLBACK* set_referrer)(struct _cef_request_t* self, void(CEF_CALLBACK* set_referrer)(struct _cef_request_t* self,
const cef_string_t* referrer_url, const cef_string_t* referrer_url,
cef_referrer_policy_t policy); cef_referrer_policy_t policy);
/// ///
// Get the referrer URL. /// Get the referrer URL.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_referrer_url)( cef_string_userfree_t(CEF_CALLBACK* get_referrer_url)(
struct _cef_request_t* self); struct _cef_request_t* self);
/// ///
// Get the referrer policy. /// Get the referrer policy.
/// ///
cef_referrer_policy_t(CEF_CALLBACK* get_referrer_policy)( cef_referrer_policy_t(CEF_CALLBACK* get_referrer_policy)(
struct _cef_request_t* self); struct _cef_request_t* self);
/// ///
// Get the post data. /// Get the post data.
/// ///
struct _cef_post_data_t*(CEF_CALLBACK* get_post_data)( struct _cef_post_data_t*(CEF_CALLBACK* get_post_data)(
struct _cef_request_t* self); struct _cef_request_t* self);
/// ///
// Set the post data. /// Set the post data.
/// ///
void(CEF_CALLBACK* set_post_data)(struct _cef_request_t* self, void(CEF_CALLBACK* set_post_data)(struct _cef_request_t* self,
struct _cef_post_data_t* postData); struct _cef_post_data_t* postData);
/// ///
// Get the header values. Will not include the Referer value if any. /// Get the header values. Will not include the Referer value if any.
/// ///
void(CEF_CALLBACK* get_header_map)(struct _cef_request_t* self, void(CEF_CALLBACK* get_header_map)(struct _cef_request_t* self,
cef_string_multimap_t headerMap); cef_string_multimap_t headerMap);
/// ///
// Set the header values. If a Referer value exists in the header map it will /// Set the header values. If a Referer value exists in the header map it will
// be removed and ignored. /// be removed and ignored.
/// ///
void(CEF_CALLBACK* set_header_map)(struct _cef_request_t* self, void(CEF_CALLBACK* set_header_map)(struct _cef_request_t* self,
cef_string_multimap_t headerMap); cef_string_multimap_t headerMap);
/// ///
// Returns the first header value for |name| or an NULL string if not found. /// Returns the first header value for |name| or an NULL string if not found.
// Will not return the Referer value if any. Use GetHeaderMap instead if /// Will not return the Referer value if any. Use GetHeaderMap instead if
// |name| might have multiple values. /// |name| might have multiple values.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_header_by_name)( cef_string_userfree_t(CEF_CALLBACK* get_header_by_name)(
@ -147,10 +147,10 @@ typedef struct _cef_request_t {
const cef_string_t* name); const cef_string_t* name);
/// ///
// Set the header |name| to |value|. If |overwrite| is true (1) any existing /// Set the header |name| to |value|. If |overwrite| is true (1) any existing
// values will be replaced with the new value. If |overwrite| is false (0) any /// values will be replaced with the new value. If |overwrite| is false (0)
// existing values will not be overwritten. The Referer value cannot be set /// any existing values will not be overwritten. The Referer value cannot be
// using this function. /// set using this function.
/// ///
void(CEF_CALLBACK* set_header_by_name)(struct _cef_request_t* self, void(CEF_CALLBACK* set_header_by_name)(struct _cef_request_t* self,
const cef_string_t* name, const cef_string_t* name,
@ -158,7 +158,7 @@ typedef struct _cef_request_t {
int overwrite); int overwrite);
/// ///
// Set all values at one time. /// Set all values at one time.
/// ///
void(CEF_CALLBACK* set)(struct _cef_request_t* self, void(CEF_CALLBACK* set)(struct _cef_request_t* self,
const cef_string_t* url, const cef_string_t* url,
@ -167,174 +167,176 @@ typedef struct _cef_request_t {
cef_string_multimap_t headerMap); cef_string_multimap_t headerMap);
/// ///
// Get the flags used in combination with cef_urlrequest_t. See /// Get the flags used in combination with cef_urlrequest_t. See
// cef_urlrequest_flags_t for supported values. /// cef_urlrequest_flags_t for supported values.
/// ///
int(CEF_CALLBACK* get_flags)(struct _cef_request_t* self); int(CEF_CALLBACK* get_flags)(struct _cef_request_t* self);
/// ///
// Set the flags used in combination with cef_urlrequest_t. See /// Set the flags used in combination with cef_urlrequest_t. See
// cef_urlrequest_flags_t for supported values. /// cef_urlrequest_flags_t for supported values.
/// ///
void(CEF_CALLBACK* set_flags)(struct _cef_request_t* self, int flags); void(CEF_CALLBACK* set_flags)(struct _cef_request_t* self, int flags);
/// ///
// Get the URL to the first party for cookies used in combination with /// Get the URL to the first party for cookies used in combination with
// cef_urlrequest_t. /// cef_urlrequest_t.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_first_party_for_cookies)( cef_string_userfree_t(CEF_CALLBACK* get_first_party_for_cookies)(
struct _cef_request_t* self); struct _cef_request_t* self);
/// ///
// Set the URL to the first party for cookies used in combination with /// Set the URL to the first party for cookies used in combination with
// cef_urlrequest_t. /// cef_urlrequest_t.
/// ///
void(CEF_CALLBACK* set_first_party_for_cookies)(struct _cef_request_t* self, void(CEF_CALLBACK* set_first_party_for_cookies)(struct _cef_request_t* self,
const cef_string_t* url); const cef_string_t* url);
/// ///
// Get the resource type for this request. Only available in the browser /// Get the resource type for this request. Only available in the browser
// process. /// process.
/// ///
cef_resource_type_t(CEF_CALLBACK* get_resource_type)( cef_resource_type_t(CEF_CALLBACK* get_resource_type)(
struct _cef_request_t* self); struct _cef_request_t* self);
/// ///
// Get the transition type for this request. Only available in the browser /// Get the transition type for this request. Only available in the browser
// process and only applies to requests that represent a main frame or sub- /// process and only applies to requests that represent a main frame or sub-
// frame navigation. /// frame navigation.
/// ///
cef_transition_type_t(CEF_CALLBACK* get_transition_type)( cef_transition_type_t(CEF_CALLBACK* get_transition_type)(
struct _cef_request_t* self); struct _cef_request_t* self);
/// ///
// Returns the globally unique identifier for this request or 0 if not /// Returns the globally unique identifier for this request or 0 if not
// specified. Can be used by cef_resource_request_handler_t implementations in /// specified. Can be used by cef_resource_request_handler_t implementations
// the browser process to track a single request across multiple callbacks. /// in the browser process to track a single request across multiple
/// callbacks.
/// ///
uint64(CEF_CALLBACK* get_identifier)(struct _cef_request_t* self); uint64(CEF_CALLBACK* get_identifier)(struct _cef_request_t* self);
} cef_request_t; } cef_request_t;
/// ///
// Create a new cef_request_t object. /// Create a new cef_request_t object.
/// ///
CEF_EXPORT cef_request_t* cef_request_create(void); CEF_EXPORT cef_request_t* cef_request_create(void);
/// ///
// Structure used to represent post data for a web request. The functions of /// Structure used to represent post data for a web request. The functions of
// this structure may be called on any thread. /// this structure may be called on any thread.
/// ///
typedef struct _cef_post_data_t { typedef struct _cef_post_data_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is read-only. /// Returns true (1) if this object is read-only.
/// ///
int(CEF_CALLBACK* is_read_only)(struct _cef_post_data_t* self); int(CEF_CALLBACK* is_read_only)(struct _cef_post_data_t* self);
/// ///
// Returns true (1) if the underlying POST data includes elements that are not /// Returns true (1) if the underlying POST data includes elements that are
// represented by this cef_post_data_t object (for example, multi-part file /// not represented by this cef_post_data_t object (for example, multi-part
// upload data). Modifying cef_post_data_t objects with excluded elements may /// file upload data). Modifying cef_post_data_t objects with excluded
// result in the request failing. /// elements may result in the request failing.
/// ///
int(CEF_CALLBACK* has_excluded_elements)(struct _cef_post_data_t* self); int(CEF_CALLBACK* has_excluded_elements)(struct _cef_post_data_t* self);
/// ///
// Returns the number of existing post data elements. /// Returns the number of existing post data elements.
/// ///
size_t(CEF_CALLBACK* get_element_count)(struct _cef_post_data_t* self); size_t(CEF_CALLBACK* get_element_count)(struct _cef_post_data_t* self);
/// ///
// Retrieve the post data elements. /// Retrieve the post data elements.
/// ///
void(CEF_CALLBACK* get_elements)(struct _cef_post_data_t* self, void(CEF_CALLBACK* get_elements)(struct _cef_post_data_t* self,
size_t* elementsCount, size_t* elementsCount,
struct _cef_post_data_element_t** elements); struct _cef_post_data_element_t** elements);
/// ///
// Remove the specified post data element. Returns true (1) if the removal /// Remove the specified post data element. Returns true (1) if the removal
// succeeds. /// succeeds.
/// ///
int(CEF_CALLBACK* remove_element)(struct _cef_post_data_t* self, int(CEF_CALLBACK* remove_element)(struct _cef_post_data_t* self,
struct _cef_post_data_element_t* element); struct _cef_post_data_element_t* element);
/// ///
// Add the specified post data element. Returns true (1) if the add succeeds. /// Add the specified post data element. Returns true (1) if the add
/// succeeds.
/// ///
int(CEF_CALLBACK* add_element)(struct _cef_post_data_t* self, int(CEF_CALLBACK* add_element)(struct _cef_post_data_t* self,
struct _cef_post_data_element_t* element); struct _cef_post_data_element_t* element);
/// ///
// Remove all existing post data elements. /// Remove all existing post data elements.
/// ///
void(CEF_CALLBACK* remove_elements)(struct _cef_post_data_t* self); void(CEF_CALLBACK* remove_elements)(struct _cef_post_data_t* self);
} cef_post_data_t; } cef_post_data_t;
/// ///
// Create a new cef_post_data_t object. /// Create a new cef_post_data_t object.
/// ///
CEF_EXPORT cef_post_data_t* cef_post_data_create(void); CEF_EXPORT cef_post_data_t* cef_post_data_create(void);
/// ///
// Structure used to represent a single element in the request post data. The /// Structure used to represent a single element in the request post data. The
// functions of this structure may be called on any thread. /// functions of this structure may be called on any thread.
/// ///
typedef struct _cef_post_data_element_t { typedef struct _cef_post_data_element_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is read-only. /// Returns true (1) if this object is read-only.
/// ///
int(CEF_CALLBACK* is_read_only)(struct _cef_post_data_element_t* self); int(CEF_CALLBACK* is_read_only)(struct _cef_post_data_element_t* self);
/// ///
// Remove all contents from the post data element. /// Remove all contents from the post data element.
/// ///
void(CEF_CALLBACK* set_to_empty)(struct _cef_post_data_element_t* self); void(CEF_CALLBACK* set_to_empty)(struct _cef_post_data_element_t* self);
/// ///
// The post data element will represent a file. /// The post data element will represent a file.
/// ///
void(CEF_CALLBACK* set_to_file)(struct _cef_post_data_element_t* self, void(CEF_CALLBACK* set_to_file)(struct _cef_post_data_element_t* self,
const cef_string_t* fileName); const cef_string_t* fileName);
/// ///
// The post data element will represent bytes. The bytes passed in will be /// The post data element will represent bytes. The bytes passed in will be
// copied. /// copied.
/// ///
void(CEF_CALLBACK* set_to_bytes)(struct _cef_post_data_element_t* self, void(CEF_CALLBACK* set_to_bytes)(struct _cef_post_data_element_t* self,
size_t size, size_t size,
const void* bytes); const void* bytes);
/// ///
// Return the type of this post data element. /// Return the type of this post data element.
/// ///
cef_postdataelement_type_t(CEF_CALLBACK* get_type)( cef_postdataelement_type_t(CEF_CALLBACK* get_type)(
struct _cef_post_data_element_t* self); struct _cef_post_data_element_t* self);
/// ///
// Return the file name. /// Return the file name.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_file)( cef_string_userfree_t(CEF_CALLBACK* get_file)(
struct _cef_post_data_element_t* self); struct _cef_post_data_element_t* self);
/// ///
// Return the number of bytes. /// Return the number of bytes.
/// ///
size_t(CEF_CALLBACK* get_bytes_count)(struct _cef_post_data_element_t* self); size_t(CEF_CALLBACK* get_bytes_count)(struct _cef_post_data_element_t* self);
/// ///
// Read up to |size| bytes into |bytes| and return the number of bytes /// Read up to |size| bytes into |bytes| and return the number of bytes
// actually read. /// actually read.
/// ///
size_t(CEF_CALLBACK* get_bytes)(struct _cef_post_data_element_t* self, size_t(CEF_CALLBACK* get_bytes)(struct _cef_post_data_element_t* self,
size_t size, size_t size,
@ -342,7 +344,7 @@ typedef struct _cef_post_data_element_t {
} cef_post_data_element_t; } cef_post_data_element_t;
/// ///
// Create a new cef_post_data_element_t object. /// Create a new cef_post_data_element_t object.
/// ///
CEF_EXPORT cef_post_data_element_t* cef_post_data_element_create(void); CEF_EXPORT cef_post_data_element_t* cef_post_data_element_create(void);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=dcff1eaa0563cfb48e0232bf78786bb0126c4255$ // $hash=0c12192146d0ecf006c1f3f294a4c2fd4bec484b$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_CAPI_H_
@ -55,18 +55,18 @@ struct _cef_request_context_handler_t;
struct _cef_scheme_handler_factory_t; struct _cef_scheme_handler_factory_t;
/// ///
// Callback structure for cef_request_context_t::ResolveHost. /// Callback structure for cef_request_context_t::ResolveHost.
/// ///
typedef struct _cef_resolve_callback_t { typedef struct _cef_resolve_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called on the UI thread after the ResolveHost request has completed. /// Called on the UI thread after the ResolveHost request has completed.
// |result| will be the result code. |resolved_ips| will be the list of /// |result| will be the result code. |resolved_ips| will be the list of
// resolved IP addresses or NULL if the resolution failed. /// resolved IP addresses or NULL if the resolution failed.
/// ///
void(CEF_CALLBACK* on_resolve_completed)(struct _cef_resolve_callback_t* self, void(CEF_CALLBACK* on_resolve_completed)(struct _cef_resolve_callback_t* self,
cef_errorcode_t result, cef_errorcode_t result,
@ -74,83 +74,83 @@ typedef struct _cef_resolve_callback_t {
} cef_resolve_callback_t; } cef_resolve_callback_t;
/// ///
// A request context provides request handling for a set of related browser or /// A request context provides request handling for a set of related browser or
// URL request objects. A request context can be specified when creating a new /// URL request objects. A request context can be specified when creating a new
// browser via the cef_browser_host_t static factory functions or when creating /// browser via the cef_browser_host_t static factory functions or when creating
// a new URL request via the cef_urlrequest_t static factory functions. Browser /// a new URL request via the cef_urlrequest_t static factory functions. Browser
// objects with different request contexts will never be hosted in the same /// objects with different request contexts will never be hosted in the same
// render process. Browser objects with the same request context may or may not /// render process. Browser objects with the same request context may or may not
// be hosted in the same render process depending on the process model. Browser /// be hosted in the same render process depending on the process model. Browser
// objects created indirectly via the JavaScript window.open function or /// objects created indirectly via the JavaScript window.open function or
// targeted links will share the same render process and the same request /// targeted links will share the same render process and the same request
// context as the source browser. When running in single-process mode there is /// context as the source browser. When running in single-process mode there is
// only a single render process (the main process) and so all browsers created /// only a single render process (the main process) and so all browsers created
// in single-process mode will share the same request context. This will be the /// in single-process mode will share the same request context. This will be the
// first request context passed into a cef_browser_host_t static factory /// first request context passed into a cef_browser_host_t static factory
// function and all other request context objects will be ignored. /// function and all other request context objects will be ignored.
/// ///
typedef struct _cef_request_context_t { typedef struct _cef_request_context_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is pointing to the same context as |that| /// Returns true (1) if this object is pointing to the same context as |that|
// object. /// object.
/// ///
int(CEF_CALLBACK* is_same)(struct _cef_request_context_t* self, int(CEF_CALLBACK* is_same)(struct _cef_request_context_t* self,
struct _cef_request_context_t* other); struct _cef_request_context_t* other);
/// ///
// Returns true (1) if this object is sharing the same storage as |that| /// Returns true (1) if this object is sharing the same storage as |that|
// object. /// object.
/// ///
int(CEF_CALLBACK* is_sharing_with)(struct _cef_request_context_t* self, int(CEF_CALLBACK* is_sharing_with)(struct _cef_request_context_t* self,
struct _cef_request_context_t* other); struct _cef_request_context_t* other);
/// ///
// Returns true (1) if this object is the global context. The global context /// Returns true (1) if this object is the global context. The global context
// is used by default when creating a browser or URL request with a NULL /// is used by default when creating a browser or URL request with a NULL
// context argument. /// context argument.
/// ///
int(CEF_CALLBACK* is_global)(struct _cef_request_context_t* self); int(CEF_CALLBACK* is_global)(struct _cef_request_context_t* self);
/// ///
// Returns the handler for this context if any. /// Returns the handler for this context if any.
/// ///
struct _cef_request_context_handler_t*(CEF_CALLBACK* get_handler)( struct _cef_request_context_handler_t*(CEF_CALLBACK* get_handler)(
struct _cef_request_context_t* self); struct _cef_request_context_t* self);
/// ///
// Returns the cache path for this object. If NULL an "incognito mode" in- /// Returns the cache path for this object. If NULL an "incognito mode" in-
// memory cache is being used. /// memory cache is being used.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_cache_path)( cef_string_userfree_t(CEF_CALLBACK* get_cache_path)(
struct _cef_request_context_t* self); struct _cef_request_context_t* self);
/// ///
// Returns the cookie manager for this object. If |callback| is non-NULL it /// Returns the cookie manager for this object. If |callback| is non-NULL it
// will be executed asnychronously on the UI thread after the manager's /// will be executed asnychronously on the UI thread after the manager's
// storage has been initialized. /// storage has been initialized.
/// ///
struct _cef_cookie_manager_t*(CEF_CALLBACK* get_cookie_manager)( struct _cef_cookie_manager_t*(CEF_CALLBACK* get_cookie_manager)(
struct _cef_request_context_t* self, struct _cef_request_context_t* self,
struct _cef_completion_callback_t* callback); struct _cef_completion_callback_t* callback);
/// ///
// Register a scheme handler factory for the specified |scheme_name| and /// Register a scheme handler factory for the specified |scheme_name| and
// optional |domain_name|. An NULL |domain_name| value for a standard scheme /// optional |domain_name|. An NULL |domain_name| value for a standard scheme
// will cause the factory to match all domain names. The |domain_name| value /// will cause the factory to match all domain names. The |domain_name| value
// will be ignored for non-standard schemes. If |scheme_name| is a built-in /// will be ignored for non-standard schemes. If |scheme_name| is a built-in
// scheme and no handler is returned by |factory| then the built-in scheme /// scheme and no handler is returned by |factory| then the built-in scheme
// handler factory will be called. If |scheme_name| is a custom scheme then /// handler factory will be called. If |scheme_name| is a custom scheme then
// you must also implement the cef_app_t::on_register_custom_schemes() /// you must also implement the cef_app_t::on_register_custom_schemes()
// function in all processes. This function may be called multiple times to /// function in all processes. This function may be called multiple times to
// change or remove the factory that matches the specified |scheme_name| and /// change or remove the factory that matches the specified |scheme_name| and
// optional |domain_name|. Returns false (0) if an error occurs. This function /// optional |domain_name|. Returns false (0) if an error occurs. This
// may be called on any thread in the browser process. /// function may be called on any thread in the browser process.
/// ///
int(CEF_CALLBACK* register_scheme_handler_factory)( int(CEF_CALLBACK* register_scheme_handler_factory)(
struct _cef_request_context_t* self, struct _cef_request_context_t* self,
@ -159,57 +159,58 @@ typedef struct _cef_request_context_t {
struct _cef_scheme_handler_factory_t* factory); struct _cef_scheme_handler_factory_t* factory);
/// ///
// Clear all registered scheme handler factories. Returns false (0) on error. /// Clear all registered scheme handler factories. Returns false (0) on error.
// This function may be called on any thread in the browser process. /// This function may be called on any thread in the browser process.
/// ///
int(CEF_CALLBACK* clear_scheme_handler_factories)( int(CEF_CALLBACK* clear_scheme_handler_factories)(
struct _cef_request_context_t* self); struct _cef_request_context_t* self);
/// ///
// Returns true (1) if a preference with the specified |name| exists. This /// Returns true (1) if a preference with the specified |name| exists. This
// function must be called on the browser process UI thread. /// function must be called on the browser process UI thread.
/// ///
int(CEF_CALLBACK* has_preference)(struct _cef_request_context_t* self, int(CEF_CALLBACK* has_preference)(struct _cef_request_context_t* self,
const cef_string_t* name); const cef_string_t* name);
/// ///
// Returns the value for the preference with the specified |name|. Returns /// Returns the value for the preference with the specified |name|. Returns
// NULL if the preference does not exist. The returned object contains a copy /// NULL if the preference does not exist. The returned object contains a copy
// of the underlying preference value and modifications to the returned object /// of the underlying preference value and modifications to the returned
// will not modify the underlying preference value. This function must be /// object will not modify the underlying preference value. This function must
// called on the browser process UI thread. /// be called on the browser process UI thread.
/// ///
struct _cef_value_t*(CEF_CALLBACK* get_preference)( struct _cef_value_t*(CEF_CALLBACK* get_preference)(
struct _cef_request_context_t* self, struct _cef_request_context_t* self,
const cef_string_t* name); const cef_string_t* name);
/// ///
// Returns all preferences as a dictionary. If |include_defaults| is true (1) /// Returns all preferences as a dictionary. If |include_defaults| is true (1)
// then preferences currently at their default value will be included. The /// then preferences currently at their default value will be included. The
// returned object contains a copy of the underlying preference values and /// returned object contains a copy of the underlying preference values and
// modifications to the returned object will not modify the underlying /// modifications to the returned object will not modify the underlying
// preference values. This function must be called on the browser process UI /// preference values. This function must be called on the browser process UI
// thread. /// thread.
/// ///
struct _cef_dictionary_value_t*(CEF_CALLBACK* get_all_preferences)( struct _cef_dictionary_value_t*(CEF_CALLBACK* get_all_preferences)(
struct _cef_request_context_t* self, struct _cef_request_context_t* self,
int include_defaults); int include_defaults);
/// ///
// Returns true (1) if the preference with the specified |name| can be /// Returns true (1) if the preference with the specified |name| can be
// modified using SetPreference. As one example preferences set via the /// modified using SetPreference. As one example preferences set via the
// command-line usually cannot be modified. This function must be called on /// command-line usually cannot be modified. This function must be called on
// the browser process UI thread. /// the browser process UI thread.
/// ///
int(CEF_CALLBACK* can_set_preference)(struct _cef_request_context_t* self, int(CEF_CALLBACK* can_set_preference)(struct _cef_request_context_t* self,
const cef_string_t* name); const cef_string_t* name);
/// ///
// Set the |value| associated with preference |name|. Returns true (1) if the /// Set the |value| associated with preference |name|. Returns true (1) if the
// value is set successfully and false (0) otherwise. If |value| is NULL the /// value is set successfully and false (0) otherwise. If |value| is NULL the
// preference will be restored to its default value. If setting the preference /// preference will be restored to its default value. If setting the
// fails then |error| will be populated with a detailed description of the /// preference fails then |error| will be populated with a detailed
// problem. This function must be called on the browser process UI thread. /// description of the problem. This function must be called on the browser
/// process UI thread.
/// ///
int(CEF_CALLBACK* set_preference)(struct _cef_request_context_t* self, int(CEF_CALLBACK* set_preference)(struct _cef_request_context_t* self,
const cef_string_t* name, const cef_string_t* name,
@ -217,91 +218,91 @@ typedef struct _cef_request_context_t {
cef_string_t* error); cef_string_t* error);
/// ///
// Clears all certificate exceptions that were added as part of handling /// Clears all certificate exceptions that were added as part of handling
// cef_request_handler_t::on_certificate_error(). If you call this it is /// cef_request_handler_t::on_certificate_error(). If you call this it is
// recommended that you also call close_all_connections() or you risk not /// recommended that you also call close_all_connections() or you risk not
// being prompted again for server certificates if you reconnect quickly. If /// being prompted again for server certificates if you reconnect quickly. If
// |callback| is non-NULL it will be executed on the UI thread after /// |callback| is non-NULL it will be executed on the UI thread after
// completion. /// completion.
/// ///
void(CEF_CALLBACK* clear_certificate_exceptions)( void(CEF_CALLBACK* clear_certificate_exceptions)(
struct _cef_request_context_t* self, struct _cef_request_context_t* self,
struct _cef_completion_callback_t* callback); struct _cef_completion_callback_t* callback);
/// ///
// Clears all HTTP authentication credentials that were added as part of /// Clears all HTTP authentication credentials that were added as part of
// handling GetAuthCredentials. If |callback| is non-NULL it will be executed /// handling GetAuthCredentials. If |callback| is non-NULL it will be executed
// on the UI thread after completion. /// on the UI thread after completion.
/// ///
void(CEF_CALLBACK* clear_http_auth_credentials)( void(CEF_CALLBACK* clear_http_auth_credentials)(
struct _cef_request_context_t* self, struct _cef_request_context_t* self,
struct _cef_completion_callback_t* callback); struct _cef_completion_callback_t* callback);
/// ///
// Clears all active and idle connections that Chromium currently has. This is /// Clears all active and idle connections that Chromium currently has. This
// only recommended if you have released all other CEF objects but don't yet /// is only recommended if you have released all other CEF objects but don't
// want to call cef_shutdown(). If |callback| is non-NULL it will be executed /// yet want to call cef_shutdown(). If |callback| is non-NULL it will be
// on the UI thread after completion. /// executed on the UI thread after completion.
/// ///
void(CEF_CALLBACK* close_all_connections)( void(CEF_CALLBACK* close_all_connections)(
struct _cef_request_context_t* self, struct _cef_request_context_t* self,
struct _cef_completion_callback_t* callback); struct _cef_completion_callback_t* callback);
/// ///
// Attempts to resolve |origin| to a list of associated IP addresses. /// Attempts to resolve |origin| to a list of associated IP addresses.
// |callback| will be executed on the UI thread after completion. /// |callback| will be executed on the UI thread after completion.
/// ///
void(CEF_CALLBACK* resolve_host)(struct _cef_request_context_t* self, void(CEF_CALLBACK* resolve_host)(struct _cef_request_context_t* self,
const cef_string_t* origin, const cef_string_t* origin,
struct _cef_resolve_callback_t* callback); struct _cef_resolve_callback_t* callback);
/// ///
// Load an extension. /// Load an extension.
// ///
// If extension resources will be read from disk using the default load /// If extension resources will be read from disk using the default load
// implementation then |root_directory| should be the absolute path to the /// implementation then |root_directory| should be the absolute path to the
// extension resources directory and |manifest| should be NULL. If extension /// extension resources directory and |manifest| should be NULL. If extension
// resources will be provided by the client (e.g. via cef_request_handler_t /// resources will be provided by the client (e.g. via cef_request_handler_t
// and/or cef_extension_handler_t) then |root_directory| should be a path /// and/or cef_extension_handler_t) then |root_directory| should be a path
// component unique to the extension (if not absolute this will be internally /// component unique to the extension (if not absolute this will be internally
// prefixed with the PK_DIR_RESOURCES path) and |manifest| should contain the /// prefixed with the PK_DIR_RESOURCES path) and |manifest| should contain the
// contents that would otherwise be read from the "manifest.json" file on /// contents that would otherwise be read from the "manifest.json" file on
// disk. /// disk.
// ///
// The loaded extension will be accessible in all contexts sharing the same /// The loaded extension will be accessible in all contexts sharing the same
// storage (HasExtension returns true (1)). However, only the context on which /// storage (HasExtension returns true (1)). However, only the context on
// this function was called is considered the loader (DidLoadExtension returns /// which this function was called is considered the loader (DidLoadExtension
// true (1)) and only the loader will receive cef_request_context_handler_t /// returns true (1)) and only the loader will receive
// callbacks for the extension. /// cef_request_context_handler_t callbacks for the extension.
// ///
// cef_extension_handler_t::OnExtensionLoaded will be called on load success /// cef_extension_handler_t::OnExtensionLoaded will be called on load success
// or cef_extension_handler_t::OnExtensionLoadFailed will be called on load /// or cef_extension_handler_t::OnExtensionLoadFailed will be called on load
// failure. /// failure.
// ///
// If the extension specifies a background script via the "background" /// If the extension specifies a background script via the "background"
// manifest key then cef_extension_handler_t::OnBeforeBackgroundBrowser will /// manifest key then cef_extension_handler_t::OnBeforeBackgroundBrowser will
// be called to create the background browser. See that function for /// be called to create the background browser. See that function for
// additional information about background scripts. /// additional information about background scripts.
// ///
// For visible extension views the client application should evaluate the /// For visible extension views the client application should evaluate the
// manifest to determine the correct extension URL to load and then pass that /// manifest to determine the correct extension URL to load and then pass that
// URL to the cef_browser_host_t::CreateBrowser* function after the extension /// URL to the cef_browser_host_t::CreateBrowser* function after the extension
// has loaded. For example, the client can look for the "browser_action" /// has loaded. For example, the client can look for the "browser_action"
// manifest key as documented at /// manifest key as documented at
// https://developer.chrome.com/extensions/browserAction. Extension URLs take /// https://developer.chrome.com/extensions/browserAction. Extension URLs take
// the form "chrome-extension://<extension_id>/<path>". /// the form "chrome-extension://<extension_id>/<path>".
// ///
// Browsers that host extensions differ from normal browsers as follows: /// Browsers that host extensions differ from normal browsers as follows:
// - Can access chrome.* JavaScript APIs if allowed by the manifest. Visit /// - Can access chrome.* JavaScript APIs if allowed by the manifest. Visit
// chrome://extensions-support for the list of extension APIs currently /// chrome://extensions-support for the list of extension APIs currently
// supported by CEF. /// supported by CEF.
// - Main frame navigation to non-extension content is blocked. /// - Main frame navigation to non-extension content is blocked.
// - Pinch-zooming is disabled. /// - Pinch-zooming is disabled.
// - CefBrowserHost::GetExtension returns the hosted extension. /// - CefBrowserHost::GetExtension returns the hosted extension.
// - CefBrowserHost::IsBackgroundHost returns true for background hosts. /// - CefBrowserHost::IsBackgroundHost returns true for background hosts.
// ///
// See https://developer.chrome.com/extensions for extension implementation /// See https://developer.chrome.com/extensions for extension implementation
// and usage documentation. /// and usage documentation.
/// ///
void(CEF_CALLBACK* load_extension)(struct _cef_request_context_t* self, void(CEF_CALLBACK* load_extension)(struct _cef_request_context_t* self,
const cef_string_t* root_directory, const cef_string_t* root_directory,
@ -309,45 +310,45 @@ typedef struct _cef_request_context_t {
struct _cef_extension_handler_t* handler); struct _cef_extension_handler_t* handler);
/// ///
// Returns true (1) if this context was used to load the extension identified /// Returns true (1) if this context was used to load the extension identified
// by |extension_id|. Other contexts sharing the same storage will also have /// by |extension_id|. Other contexts sharing the same storage will also have
// access to the extension (see HasExtension). This function must be called on /// access to the extension (see HasExtension). This function must be called
// the browser process UI thread. /// on the browser process UI thread.
/// ///
int(CEF_CALLBACK* did_load_extension)(struct _cef_request_context_t* self, int(CEF_CALLBACK* did_load_extension)(struct _cef_request_context_t* self,
const cef_string_t* extension_id); const cef_string_t* extension_id);
/// ///
// Returns true (1) if this context has access to the extension identified by /// Returns true (1) if this context has access to the extension identified by
// |extension_id|. This may not be the context that was used to load the /// |extension_id|. This may not be the context that was used to load the
// extension (see DidLoadExtension). This function must be called on the /// extension (see DidLoadExtension). This function must be called on the
// browser process UI thread. /// browser process UI thread.
/// ///
int(CEF_CALLBACK* has_extension)(struct _cef_request_context_t* self, int(CEF_CALLBACK* has_extension)(struct _cef_request_context_t* self,
const cef_string_t* extension_id); const cef_string_t* extension_id);
/// ///
// Retrieve the list of all extensions that this context has access to (see /// Retrieve the list of all extensions that this context has access to (see
// HasExtension). |extension_ids| will be populated with the list of extension /// HasExtension). |extension_ids| will be populated with the list of
// ID values. Returns true (1) on success. This function must be called on the /// extension ID values. Returns true (1) on success. This function must be
// browser process UI thread. /// called on the browser process UI thread.
/// ///
int(CEF_CALLBACK* get_extensions)(struct _cef_request_context_t* self, int(CEF_CALLBACK* get_extensions)(struct _cef_request_context_t* self,
cef_string_list_t extension_ids); cef_string_list_t extension_ids);
/// ///
// Returns the extension matching |extension_id| or NULL if no matching /// Returns the extension matching |extension_id| or NULL if no matching
// extension is accessible in this context (see HasExtension). This function /// extension is accessible in this context (see HasExtension). This function
// must be called on the browser process UI thread. /// must be called on the browser process UI thread.
/// ///
struct _cef_extension_t*(CEF_CALLBACK* get_extension)( struct _cef_extension_t*(CEF_CALLBACK* get_extension)(
struct _cef_request_context_t* self, struct _cef_request_context_t* self,
const cef_string_t* extension_id); const cef_string_t* extension_id);
/// ///
// Returns the MediaRouter object associated with this context. If |callback| /// Returns the MediaRouter object associated with this context. If
// is non-NULL it will be executed asnychronously on the UI thread after the /// |callback| is non-NULL it will be executed asnychronously on the UI thread
// manager's context has been initialized. /// after the manager's context has been initialized.
/// ///
struct _cef_media_router_t*(CEF_CALLBACK* get_media_router)( struct _cef_media_router_t*(CEF_CALLBACK* get_media_router)(
struct _cef_request_context_t* self, struct _cef_request_context_t* self,
@ -355,21 +356,21 @@ typedef struct _cef_request_context_t {
} cef_request_context_t; } cef_request_context_t;
/// ///
// Returns the global context object. /// Returns the global context object.
/// ///
CEF_EXPORT cef_request_context_t* cef_request_context_get_global_context(void); CEF_EXPORT cef_request_context_t* cef_request_context_get_global_context(void);
/// ///
// Creates a new context object with the specified |settings| and optional /// Creates a new context object with the specified |settings| and optional
// |handler|. /// |handler|.
/// ///
CEF_EXPORT cef_request_context_t* cef_request_context_create_context( CEF_EXPORT cef_request_context_t* cef_request_context_create_context(
const struct _cef_request_context_settings_t* settings, const struct _cef_request_context_settings_t* settings,
struct _cef_request_context_handler_t* handler); struct _cef_request_context_handler_t* handler);
/// ///
// Creates a new context object that shares storage with |other| and uses an /// Creates a new context object that shares storage with |other| and uses an
// optional |handler|. /// optional |handler|.
/// ///
CEF_EXPORT cef_request_context_t* cef_create_context_shared( CEF_EXPORT cef_request_context_t* cef_create_context_shared(
cef_request_context_t* other, cef_request_context_t* other,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=b2657a441a701c5ddaca68dc604fd94153a3220f$ // $hash=e2a1abf4d73bb90fb077cc5642d7b95ac5c11c14$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_HANDLER_CAPI_H_
@ -51,41 +51,42 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to provide handler implementations. The handler /// Implement this structure to provide handler implementations. The handler
// instance will not be released until all objects related to the context have /// instance will not be released until all objects related to the context have
// been destroyed. /// been destroyed.
/// ///
typedef struct _cef_request_context_handler_t { typedef struct _cef_request_context_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called on the browser process UI thread immediately after the request /// Called on the browser process UI thread immediately after the request
// context has been initialized. /// context has been initialized.
/// ///
void(CEF_CALLBACK* on_request_context_initialized)( void(CEF_CALLBACK* on_request_context_initialized)(
struct _cef_request_context_handler_t* self, struct _cef_request_context_handler_t* self,
struct _cef_request_context_t* request_context); struct _cef_request_context_t* request_context);
/// ///
// Called on the browser process IO thread before a resource request is /// Called on the browser process IO thread before a resource request is
// initiated. The |browser| and |frame| values represent the source of the /// initiated. The |browser| and |frame| values represent the source of the
// request, and may be NULL for requests originating from service workers or /// request, and may be NULL for requests originating from service workers or
// cef_urlrequest_t. |request| represents the request contents and cannot be /// cef_urlrequest_t. |request| represents the request contents and cannot be
// modified in this callback. |is_navigation| will be true (1) if the resource /// modified in this callback. |is_navigation| will be true (1) if the
// request is a navigation. |is_download| will be true (1) if the resource /// resource request is a navigation. |is_download| will be true (1) if the
// request is a download. |request_initiator| is the origin (scheme + domain) /// resource request is a download. |request_initiator| is the origin (scheme
// of the page that initiated the request. Set |disable_default_handling| to /// + domain) of the page that initiated the request. Set
// true (1) to disable default handling of the request, in which case it will /// |disable_default_handling| to true (1) to disable default handling of the
// need to be handled via cef_resource_request_handler_t::GetResourceHandler /// request, in which case it will need to be handled via
// or it will be canceled. To allow the resource load to proceed with default /// cef_resource_request_handler_t::GetResourceHandler or it will be canceled.
// handling return NULL. To specify a handler for the resource return a /// To allow the resource load to proceed with default handling return NULL.
// cef_resource_request_handler_t object. This function will not be called if /// To specify a handler for the resource return a
// the client associated with |browser| returns a non-NULL value from /// cef_resource_request_handler_t object. This function will not be called if
// cef_request_handler_t::GetResourceRequestHandler for the same request /// the client associated with |browser| returns a non-NULL value from
// (identified by cef_request_t::GetIdentifier). /// cef_request_handler_t::GetResourceRequestHandler for the same request
/// (identified by cef_request_t::GetIdentifier).
/// ///
struct _cef_resource_request_handler_t*( struct _cef_resource_request_handler_t*(
CEF_CALLBACK* get_resource_request_handler)( CEF_CALLBACK* get_resource_request_handler)(

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=4e19e04de13949f20e63e44542bc0a0eeed46b43$ // $hash=0524a218f8cb54cfde70f2ec475520b11923c2f7$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_HANDLER_CAPI_H_
@ -55,17 +55,17 @@ extern "C" {
#endif #endif
/// ///
// Callback structure used to select a client certificate for authentication. /// Callback structure used to select a client certificate for authentication.
/// ///
typedef struct _cef_select_client_certificate_callback_t { typedef struct _cef_select_client_certificate_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Chooses the specified certificate for client certificate authentication. /// Chooses the specified certificate for client certificate authentication.
// NULL value means that no client certificate should be used. /// NULL value means that no client certificate should be used.
/// ///
void(CEF_CALLBACK* select)( void(CEF_CALLBACK* select)(
struct _cef_select_client_certificate_callback_t* self, struct _cef_select_client_certificate_callback_t* self,
@ -73,26 +73,27 @@ typedef struct _cef_select_client_certificate_callback_t {
} cef_select_client_certificate_callback_t; } cef_select_client_certificate_callback_t;
/// ///
// Implement this structure to handle events related to browser requests. The /// Implement this structure to handle events related to browser requests. The
// functions of this structure will be called on the thread indicated. /// functions of this structure will be called on the thread indicated.
/// ///
typedef struct _cef_request_handler_t { typedef struct _cef_request_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called on the UI thread before browser navigation. Return true (1) to /// Called on the UI thread before browser navigation. Return true (1) to
// cancel the navigation or false (0) to allow the navigation to proceed. The /// cancel the navigation or false (0) to allow the navigation to proceed. The
// |request| object cannot be modified in this callback. /// |request| object cannot be modified in this callback.
// cef_load_handler_t::OnLoadingStateChange will be called twice in all cases. /// cef_load_handler_t::OnLoadingStateChange will be called twice in all
// If the navigation is allowed cef_load_handler_t::OnLoadStart and /// cases. If the navigation is allowed cef_load_handler_t::OnLoadStart and
// cef_load_handler_t::OnLoadEnd will be called. If the navigation is canceled /// cef_load_handler_t::OnLoadEnd will be called. If the navigation is
// cef_load_handler_t::OnLoadError will be called with an |errorCode| value of /// canceled cef_load_handler_t::OnLoadError will be called with an
// ERR_ABORTED. The |user_gesture| value will be true (1) if the browser /// |errorCode| value of ERR_ABORTED. The |user_gesture| value will be true
// navigated via explicit user gesture (e.g. clicking a link) or false (0) if /// (1) if the browser navigated via explicit user gesture (e.g. clicking a
// it navigated automatically (e.g. via the DomContentLoaded event). /// link) or false (0) if it navigated automatically (e.g. via the
/// DomContentLoaded event).
/// ///
int(CEF_CALLBACK* on_before_browse)(struct _cef_request_handler_t* self, int(CEF_CALLBACK* on_before_browse)(struct _cef_request_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -102,20 +103,20 @@ typedef struct _cef_request_handler_t {
int is_redirect); int is_redirect);
/// ///
// Called on the UI thread before OnBeforeBrowse in certain limited cases /// Called on the UI thread before OnBeforeBrowse in certain limited cases
// where navigating a new or different browser might be desirable. This /// where navigating a new or different browser might be desirable. This
// includes user-initiated navigation that might open in a special way (e.g. /// includes user-initiated navigation that might open in a special way (e.g.
// links clicked via middle-click or ctrl + left-click) and certain types of /// links clicked via middle-click or ctrl + left-click) and certain types of
// cross-origin navigation initiated from the renderer process (e.g. /// cross-origin navigation initiated from the renderer process (e.g.
// navigating the top-level frame to/from a file URL). The |browser| and /// navigating the top-level frame to/from a file URL). The |browser| and
// |frame| values represent the source of the navigation. The /// |frame| values represent the source of the navigation. The
// |target_disposition| value indicates where the user intended to navigate /// |target_disposition| value indicates where the user intended to navigate
// the browser based on standard Chromium behaviors (e.g. current tab, new /// the browser based on standard Chromium behaviors (e.g. current tab, new
// tab, etc). The |user_gesture| value will be true (1) if the browser /// tab, etc). The |user_gesture| value will be true (1) if the browser
// navigated via explicit user gesture (e.g. clicking a link) or false (0) if /// navigated via explicit user gesture (e.g. clicking a link) or false (0) if
// it navigated automatically (e.g. via the DomContentLoaded event). Return /// it navigated automatically (e.g. via the DomContentLoaded event). Return
// true (1) to cancel the navigation or false (0) to allow the navigation to /// true (1) to cancel the navigation or false (0) to allow the navigation to
// proceed in the source browser's top-level frame. /// proceed in the source browser's top-level frame.
/// ///
int(CEF_CALLBACK* on_open_urlfrom_tab)( int(CEF_CALLBACK* on_open_urlfrom_tab)(
struct _cef_request_handler_t* self, struct _cef_request_handler_t* self,
@ -126,20 +127,20 @@ typedef struct _cef_request_handler_t {
int user_gesture); int user_gesture);
/// ///
// Called on the browser process IO thread before a resource request is /// Called on the browser process IO thread before a resource request is
// initiated. The |browser| and |frame| values represent the source of the /// initiated. The |browser| and |frame| values represent the source of the
// request. |request| represents the request contents and cannot be modified /// request. |request| represents the request contents and cannot be modified
// in this callback. |is_navigation| will be true (1) if the resource request /// in this callback. |is_navigation| will be true (1) if the resource request
// is a navigation. |is_download| will be true (1) if the resource request is /// is a navigation. |is_download| will be true (1) if the resource request is
// a download. |request_initiator| is the origin (scheme + domain) of the page /// a download. |request_initiator| is the origin (scheme + domain) of the
// that initiated the request. Set |disable_default_handling| to true (1) to /// page that initiated the request. Set |disable_default_handling| to true
// disable default handling of the request, in which case it will need to be /// (1) to disable default handling of the request, in which case it will need
// handled via cef_resource_request_handler_t::GetResourceHandler or it will /// to be handled via cef_resource_request_handler_t::GetResourceHandler or it
// be canceled. To allow the resource load to proceed with default handling /// will be canceled. To allow the resource load to proceed with default
// return NULL. To specify a handler for the resource return a /// handling return NULL. To specify a handler for the resource return a
// cef_resource_request_handler_t object. If this callback returns NULL the /// cef_resource_request_handler_t object. If this callback returns NULL the
// same function will be called on the associated /// same function will be called on the associated
// cef_request_context_handler_t, if any. /// cef_request_context_handler_t, if any.
/// ///
struct _cef_resource_request_handler_t*( struct _cef_resource_request_handler_t*(
CEF_CALLBACK* get_resource_request_handler)( CEF_CALLBACK* get_resource_request_handler)(
@ -153,16 +154,16 @@ typedef struct _cef_request_handler_t {
int* disable_default_handling); int* disable_default_handling);
/// ///
// Called on the IO thread when the browser needs credentials from the user. /// Called on the IO thread when the browser needs credentials from the user.
// |origin_url| is the origin making this authentication request. |isProxy| /// |origin_url| is the origin making this authentication request. |isProxy|
// indicates whether the host is a proxy server. |host| contains the hostname /// indicates whether the host is a proxy server. |host| contains the hostname
// and |port| contains the port number. |realm| is the realm of the challenge /// and |port| contains the port number. |realm| is the realm of the challenge
// and may be NULL. |scheme| is the authentication scheme used, such as /// and may be NULL. |scheme| is the authentication scheme used, such as
// "basic" or "digest", and will be NULL if the source of the request is an /// "basic" or "digest", and will be NULL if the source of the request is an
// FTP server. Return true (1) to continue the request and call /// FTP server. Return true (1) to continue the request and call
// cef_auth_callback_t::cont() either in this function or at a later time when /// cef_auth_callback_t::cont() either in this function or at a later time
// the authentication information is available. Return false (0) to cancel the /// when the authentication information is available. Return false (0) to
// request immediately. /// cancel the request immediately.
/// ///
int(CEF_CALLBACK* get_auth_credentials)( int(CEF_CALLBACK* get_auth_credentials)(
struct _cef_request_handler_t* self, struct _cef_request_handler_t* self,
@ -176,13 +177,13 @@ typedef struct _cef_request_handler_t {
struct _cef_auth_callback_t* callback); struct _cef_auth_callback_t* callback);
/// ///
// Called on the IO thread when JavaScript requests a specific storage quota /// Called on the IO thread when JavaScript requests a specific storage quota
// size via the webkitStorageInfo.requestQuota function. |origin_url| is the /// size via the webkitStorageInfo.requestQuota function. |origin_url| is the
// origin of the page making the request. |new_size| is the requested quota /// origin of the page making the request. |new_size| is the requested quota
// size in bytes. Return true (1) to continue the request and call /// size in bytes. Return true (1) to continue the request and call
// cef_callback_t functions either in this function or at a later time to /// cef_callback_t functions either in this function or at a later time to
// grant or deny the request. Return false (0) to cancel the request /// grant or deny the request. Return false (0) to cancel the request
// immediately. /// immediately.
/// ///
int(CEF_CALLBACK* on_quota_request)(struct _cef_request_handler_t* self, int(CEF_CALLBACK* on_quota_request)(struct _cef_request_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -191,12 +192,12 @@ typedef struct _cef_request_handler_t {
struct _cef_callback_t* callback); struct _cef_callback_t* callback);
/// ///
// Called on the UI thread to handle requests for URLs with an invalid SSL /// Called on the UI thread to handle requests for URLs with an invalid SSL
// certificate. Return true (1) and call cef_callback_t functions either in /// certificate. Return true (1) and call cef_callback_t functions either in
// this function or at a later time to continue or cancel the request. Return /// this function or at a later time to continue or cancel the request. Return
// false (0) to cancel the request immediately. If /// false (0) to cancel the request immediately. If
// CefSettings.ignore_certificate_errors is set all invalid certificates will /// cef_settings_t.ignore_certificate_errors is set all invalid certificates
// be accepted without calling this function. /// will be accepted without calling this function.
/// ///
int(CEF_CALLBACK* on_certificate_error)(struct _cef_request_handler_t* self, int(CEF_CALLBACK* on_certificate_error)(struct _cef_request_handler_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -206,17 +207,17 @@ typedef struct _cef_request_handler_t {
struct _cef_callback_t* callback); struct _cef_callback_t* callback);
/// ///
// Called on the UI thread when a client certificate is being requested for /// Called on the UI thread when a client certificate is being requested for
// authentication. Return false (0) to use the default behavior and /// authentication. Return false (0) to use the default behavior and
// automatically select the first certificate available. Return true (1) and /// automatically select the first certificate available. Return true (1) and
// call cef_select_client_certificate_callback_t::Select either in this /// call cef_select_client_certificate_callback_t::Select either in this
// function or at a later time to select a certificate. Do not call Select or /// function or at a later time to select a certificate. Do not call Select or
// call it with NULL to continue without using any certificate. |isProxy| /// call it with NULL to continue without using any certificate. |isProxy|
// indicates whether the host is an HTTPS proxy or the origin server. |host| /// indicates whether the host is an HTTPS proxy or the origin server. |host|
// and |port| contains the hostname and port of the SSL server. |certificates| /// and |port| contains the hostname and port of the SSL server.
// is the list of certificates to choose from; this list has already been /// |certificates| is the list of certificates to choose from; this list has
// pruned by Chromium so that it only contains certificates from issuers that /// already been pruned by Chromium so that it only contains certificates from
// the server trusts. /// issuers that the server trusts.
/// ///
int(CEF_CALLBACK* on_select_client_certificate)( int(CEF_CALLBACK* on_select_client_certificate)(
struct _cef_request_handler_t* self, struct _cef_request_handler_t* self,
@ -229,16 +230,16 @@ typedef struct _cef_request_handler_t {
struct _cef_select_client_certificate_callback_t* callback); struct _cef_select_client_certificate_callback_t* callback);
/// ///
// Called on the browser process UI thread when the render view associated /// Called on the browser process UI thread when the render view associated
// with |browser| is ready to receive/handle IPC messages in the render /// with |browser| is ready to receive/handle IPC messages in the render
// process. /// process.
/// ///
void(CEF_CALLBACK* on_render_view_ready)(struct _cef_request_handler_t* self, void(CEF_CALLBACK* on_render_view_ready)(struct _cef_request_handler_t* self,
struct _cef_browser_t* browser); struct _cef_browser_t* browser);
/// ///
// Called on the browser process UI thread when the render process terminates /// Called on the browser process UI thread when the render process terminates
// unexpectedly. |status| indicates how the process terminated. /// unexpectedly. |status| indicates how the process terminated.
/// ///
void(CEF_CALLBACK* on_render_process_terminated)( void(CEF_CALLBACK* on_render_process_terminated)(
struct _cef_request_handler_t* self, struct _cef_request_handler_t* self,
@ -246,8 +247,8 @@ typedef struct _cef_request_handler_t {
cef_termination_status_t status); cef_termination_status_t status);
/// ///
// Called on the browser process UI thread when the window.document object of /// Called on the browser process UI thread when the window.document object of
// the main frame has been created. /// the main frame has been created.
/// ///
void(CEF_CALLBACK* on_document_available_in_main_frame)( void(CEF_CALLBACK* on_document_available_in_main_frame)(
struct _cef_request_handler_t* self, struct _cef_request_handler_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=6d8a7e3c0ed66cad10e8a0c59fed51431ec82ce5$ // $hash=4350dcf46e2fcd18bea2c45446e448e588795afb$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_BUNDLE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_BUNDLE_CAPI_H_
@ -48,22 +48,22 @@ extern "C" {
#endif #endif
/// ///
// Structure used for retrieving resources from the resource bundle (*.pak) /// Structure used for retrieving resources from the resource bundle (*.pak)
// files loaded by CEF during startup or via the cef_resource_bundle_handler_t /// files loaded by CEF during startup or via the cef_resource_bundle_handler_t
// returned from cef_app_t::GetResourceBundleHandler. See CefSettings for /// returned from cef_app_t::GetResourceBundleHandler. See CefSettings for
// additional options related to resource bundle loading. The functions of this /// additional options related to resource bundle loading. The functions of this
// structure may be called on any thread unless otherwise indicated. /// structure may be called on any thread unless otherwise indicated.
/// ///
typedef struct _cef_resource_bundle_t { typedef struct _cef_resource_bundle_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns the localized string for the specified |string_id| or an NULL /// Returns the localized string for the specified |string_id| or an NULL
// string if the value is not found. Include cef_pack_strings.h for a listing /// string if the value is not found. Include cef_pack_strings.h for a listing
// of valid string ID values. /// of valid string ID values.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_localized_string)( cef_string_userfree_t(CEF_CALLBACK* get_localized_string)(
@ -71,20 +71,20 @@ typedef struct _cef_resource_bundle_t {
int string_id); int string_id);
/// ///
// Returns a cef_binary_value_t containing the decompressed contents of the /// Returns a cef_binary_value_t containing the decompressed contents of the
// specified scale independent |resource_id| or NULL if not found. Include /// specified scale independent |resource_id| or NULL if not found. Include
// cef_pack_resources.h for a listing of valid resource ID values. /// cef_pack_resources.h for a listing of valid resource ID values.
/// ///
struct _cef_binary_value_t*(CEF_CALLBACK* get_data_resource)( struct _cef_binary_value_t*(CEF_CALLBACK* get_data_resource)(
struct _cef_resource_bundle_t* self, struct _cef_resource_bundle_t* self,
int resource_id); int resource_id);
/// ///
// Returns a cef_binary_value_t containing the decompressed contents of the /// Returns a cef_binary_value_t containing the decompressed contents of the
// specified |resource_id| nearest the scale factor |scale_factor| or NULL if /// specified |resource_id| nearest the scale factor |scale_factor| or NULL if
// not found. Use a |scale_factor| value of SCALE_FACTOR_NONE for scale /// not found. Use a |scale_factor| value of SCALE_FACTOR_NONE for scale
// independent resources or call GetDataResource instead.Include /// independent resources or call GetDataResource instead.Include
// cef_pack_resources.h for a listing of valid resource ID values. /// cef_pack_resources.h for a listing of valid resource ID values.
/// ///
struct _cef_binary_value_t*(CEF_CALLBACK* get_data_resource_for_scale)( struct _cef_binary_value_t*(CEF_CALLBACK* get_data_resource_for_scale)(
struct _cef_resource_bundle_t* self, struct _cef_resource_bundle_t* self,
@ -93,7 +93,7 @@ typedef struct _cef_resource_bundle_t {
} cef_resource_bundle_t; } cef_resource_bundle_t;
/// ///
// Returns the global resource bundle instance. /// Returns the global resource bundle instance.
/// ///
CEF_EXPORT cef_resource_bundle_t* cef_resource_bundle_get_global(void); CEF_EXPORT cef_resource_bundle_t* cef_resource_bundle_get_global(void);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=3d7b3d4702c8d35dc8780f9e87eb7560d6ce1dee$ // $hash=5f8c2d1e11779072e83610190ed7215324028d07$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_BUNDLE_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_BUNDLE_HANDLER_CAPI_H_
@ -47,21 +47,21 @@ extern "C" {
#endif #endif
/// ///
// Structure used to implement a custom resource bundle structure. See /// Structure used to implement a custom resource bundle structure. See
// CefSettings for additional options related to resource bundle loading. The /// CefSettings for additional options related to resource bundle loading. The
// functions of this structure may be called on multiple threads. /// functions of this structure may be called on multiple threads.
/// ///
typedef struct _cef_resource_bundle_handler_t { typedef struct _cef_resource_bundle_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called to retrieve a localized translation for the specified |string_id|. /// Called to retrieve a localized translation for the specified |string_id|.
// To provide the translation set |string| to the translation string and /// To provide the translation set |string| to the translation string and
// return true (1). To use the default translation return false (0). Include /// return true (1). To use the default translation return false (0). Include
// cef_pack_strings.h for a listing of valid string ID values. /// cef_pack_strings.h for a listing of valid string ID values.
/// ///
int(CEF_CALLBACK* get_localized_string)( int(CEF_CALLBACK* get_localized_string)(
struct _cef_resource_bundle_handler_t* self, struct _cef_resource_bundle_handler_t* self,
@ -69,12 +69,12 @@ typedef struct _cef_resource_bundle_handler_t {
cef_string_t* string); cef_string_t* string);
/// ///
// Called to retrieve data for the specified scale independent |resource_id|. /// Called to retrieve data for the specified scale independent |resource_id|.
// To provide the resource data set |data| and |data_size| to the data pointer /// To provide the resource data set |data| and |data_size| to the data
// and size respectively and return true (1). To use the default resource data /// pointer and size respectively and return true (1). To use the default
// return false (0). The resource data will not be copied and must remain /// resource data return false (0). The resource data will not be copied and
// resident in memory. Include cef_pack_resources.h for a listing of valid /// must remain resident in memory. Include cef_pack_resources.h for a listing
// resource ID values. /// of valid resource ID values.
/// ///
int(CEF_CALLBACK* get_data_resource)( int(CEF_CALLBACK* get_data_resource)(
struct _cef_resource_bundle_handler_t* self, struct _cef_resource_bundle_handler_t* self,
@ -83,12 +83,12 @@ typedef struct _cef_resource_bundle_handler_t {
size_t* data_size); size_t* data_size);
/// ///
// Called to retrieve data for the specified |resource_id| nearest the scale /// Called to retrieve data for the specified |resource_id| nearest the scale
// factor |scale_factor|. To provide the resource data set |data| and /// factor |scale_factor|. To provide the resource data set |data| and
// |data_size| to the data pointer and size respectively and return true (1). /// |data_size| to the data pointer and size respectively and return true (1).
// To use the default resource data return false (0). The resource data will /// To use the default resource data return false (0). The resource data will
// not be copied and must remain resident in memory. Include /// not be copied and must remain resident in memory. Include
// cef_pack_resources.h for a listing of valid resource ID values. /// cef_pack_resources.h for a listing of valid resource ID values.
/// ///
int(CEF_CALLBACK* get_data_resource_for_scale)( int(CEF_CALLBACK* get_data_resource_for_scale)(
struct _cef_resource_bundle_handler_t* self, struct _cef_resource_bundle_handler_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=67df3d56f0cc0f58d2b0a2fe884bbb2c1c39813f$ // $hash=3373cc29becf60303d1f01774c1ed8017c3f0da3$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_HANDLER_CAPI_H_
@ -52,63 +52,64 @@ extern "C" {
#endif #endif
/// ///
// Callback for asynchronous continuation of cef_resource_handler_t::skip(). /// Callback for asynchronous continuation of cef_resource_handler_t::skip().
/// ///
typedef struct _cef_resource_skip_callback_t { typedef struct _cef_resource_skip_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Callback for asynchronous continuation of skip(). If |bytes_skipped| > 0 /// Callback for asynchronous continuation of skip(). If |bytes_skipped| > 0
// then either skip() will be called again until the requested number of bytes /// then either skip() will be called again until the requested number of
// have been skipped or the request will proceed. If |bytes_skipped| <= 0 the /// bytes have been skipped or the request will proceed. If |bytes_skipped| <=
// request will fail with ERR_REQUEST_RANGE_NOT_SATISFIABLE. /// 0 the request will fail with ERR_REQUEST_RANGE_NOT_SATISFIABLE.
/// ///
void(CEF_CALLBACK* cont)(struct _cef_resource_skip_callback_t* self, void(CEF_CALLBACK* cont)(struct _cef_resource_skip_callback_t* self,
int64 bytes_skipped); int64 bytes_skipped);
} cef_resource_skip_callback_t; } cef_resource_skip_callback_t;
/// ///
// Callback for asynchronous continuation of cef_resource_handler_t::read(). /// Callback for asynchronous continuation of cef_resource_handler_t::read().
/// ///
typedef struct _cef_resource_read_callback_t { typedef struct _cef_resource_read_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Callback for asynchronous continuation of read(). If |bytes_read| == 0 the /// Callback for asynchronous continuation of read(). If |bytes_read| == 0 the
// response will be considered complete. If |bytes_read| > 0 then read() will /// response will be considered complete. If |bytes_read| > 0 then read() will
// be called again until the request is complete (based on either the result /// be called again until the request is complete (based on either the result
// or the expected content length). If |bytes_read| < 0 then the request will /// or the expected content length). If |bytes_read| < 0 then the request will
// fail and the |bytes_read| value will be treated as the error code. /// fail and the |bytes_read| value will be treated as the error code.
/// ///
void(CEF_CALLBACK* cont)(struct _cef_resource_read_callback_t* self, void(CEF_CALLBACK* cont)(struct _cef_resource_read_callback_t* self,
int bytes_read); int bytes_read);
} cef_resource_read_callback_t; } cef_resource_read_callback_t;
/// ///
// Structure used to implement a custom request handler structure. The functions /// Structure used to implement a custom request handler structure. The
// of this structure will be called on the IO thread unless otherwise indicated. /// functions of this structure will be called on the IO thread unless otherwise
/// indicated.
/// ///
typedef struct _cef_resource_handler_t { typedef struct _cef_resource_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Open the response stream. To handle the request immediately set /// Open the response stream. To handle the request immediately set
// |handle_request| to true (1) and return true (1). To decide at a later time /// |handle_request| to true (1) and return true (1). To decide at a later
// set |handle_request| to false (0), return true (1), and execute |callback| /// time set |handle_request| to false (0), return true (1), and execute
// to continue or cancel the request. To cancel the request immediately set /// |callback| to continue or cancel the request. To cancel the request
// |handle_request| to true (1) and return false (0). This function will be /// immediately set |handle_request| to true (1) and return false (0). This
// called in sequence but not from a dedicated thread. For backwards /// function will be called in sequence but not from a dedicated thread. For
// compatibility set |handle_request| to false (0) and return false (0) and /// backwards compatibility set |handle_request| to false (0) and return false
// the ProcessRequest function will be called. /// (0) and the ProcessRequest function will be called.
/// ///
int(CEF_CALLBACK* open)(struct _cef_resource_handler_t* self, int(CEF_CALLBACK* open)(struct _cef_resource_handler_t* self,
struct _cef_request_t* request, struct _cef_request_t* request,
@ -116,32 +117,32 @@ typedef struct _cef_resource_handler_t {
struct _cef_callback_t* callback); struct _cef_callback_t* callback);
/// ///
// Begin processing the request. To handle the request return true (1) and /// Begin processing the request. To handle the request return true (1) and
// call cef_callback_t::cont() once the response header information is /// call cef_callback_t::cont() once the response header information is
// available (cef_callback_t::cont() can also be called from inside this /// available (cef_callback_t::cont() can also be called from inside this
// function if header information is available immediately). To cancel the /// function if header information is available immediately). To cancel the
// request return false (0). /// request return false (0).
// ///
// WARNING: This function is deprecated. Use Open instead. /// WARNING: This function is deprecated. Use Open instead.
/// ///
int(CEF_CALLBACK* process_request)(struct _cef_resource_handler_t* self, int(CEF_CALLBACK* process_request)(struct _cef_resource_handler_t* self,
struct _cef_request_t* request, struct _cef_request_t* request,
struct _cef_callback_t* callback); struct _cef_callback_t* callback);
/// ///
// Retrieve response header information. If the response length is not known /// Retrieve response header information. If the response length is not known
// set |response_length| to -1 and read_response() will be called until it /// set |response_length| to -1 and read_response() will be called until it
// returns false (0). If the response length is known set |response_length| to /// returns false (0). If the response length is known set |response_length|
// a positive value and read_response() will be called until it returns false /// to a positive value and read_response() will be called until it returns
// (0) or the specified number of bytes have been read. Use the |response| /// false (0) or the specified number of bytes have been read. Use the
// object to set the mime type, http status code and other optional header /// |response| object to set the mime type, http status code and other
// values. To redirect the request to a new URL set |redirectUrl| to the new /// optional header values. To redirect the request to a new URL set
// URL. |redirectUrl| can be either a relative or fully qualified URL. It is /// |redirectUrl| to the new URL. |redirectUrl| can be either a relative or
// also possible to set |response| to a redirect http status code and pass the /// fully qualified URL. It is also possible to set |response| to a redirect
// new URL via a Location header. Likewise with |redirectUrl| it is valid to /// http status code and pass the new URL via a Location header. Likewise with
// set a relative or fully qualified URL as the Location header value. If an /// |redirectUrl| it is valid to set a relative or fully qualified URL as the
// error occured while setting up the request you can call set_error() on /// Location header value. If an error occured while setting up the request
// |response| to indicate the error condition. /// you can call set_error() on |response| to indicate the error condition.
/// ///
void(CEF_CALLBACK* get_response_headers)(struct _cef_resource_handler_t* self, void(CEF_CALLBACK* get_response_headers)(struct _cef_resource_handler_t* self,
struct _cef_response_t* response, struct _cef_response_t* response,
@ -149,13 +150,13 @@ typedef struct _cef_resource_handler_t {
cef_string_t* redirectUrl); cef_string_t* redirectUrl);
/// ///
// Skip response data when requested by a Range header. Skip over and discard /// Skip response data when requested by a Range header. Skip over and discard
// |bytes_to_skip| bytes of response data. If data is available immediately /// |bytes_to_skip| bytes of response data. If data is available immediately
// set |bytes_skipped| to the number of bytes skipped and return true (1). To /// set |bytes_skipped| to the number of bytes skipped and return true (1). To
// read the data at a later time set |bytes_skipped| to 0, return true (1) and /// read the data at a later time set |bytes_skipped| to 0, return true (1)
// execute |callback| when the data is available. To indicate failure set /// and execute |callback| when the data is available. To indicate failure set
// |bytes_skipped| to < 0 (e.g. -2 for ERR_FAILED) and return false (0). This /// |bytes_skipped| to < 0 (e.g. -2 for ERR_FAILED) and return false (0). This
// function will be called in sequence but not from a dedicated thread. /// function will be called in sequence but not from a dedicated thread.
/// ///
int(CEF_CALLBACK* skip)(struct _cef_resource_handler_t* self, int(CEF_CALLBACK* skip)(struct _cef_resource_handler_t* self,
int64 bytes_to_skip, int64 bytes_to_skip,
@ -163,17 +164,17 @@ typedef struct _cef_resource_handler_t {
struct _cef_resource_skip_callback_t* callback); struct _cef_resource_skip_callback_t* callback);
/// ///
// Read response data. If data is available immediately copy up to /// Read response data. If data is available immediately copy up to
// |bytes_to_read| bytes into |data_out|, set |bytes_read| to the number of /// |bytes_to_read| bytes into |data_out|, set |bytes_read| to the number of
// bytes copied, and return true (1). To read the data at a later time keep a /// bytes copied, and return true (1). To read the data at a later time keep a
// pointer to |data_out|, set |bytes_read| to 0, return true (1) and execute /// pointer to |data_out|, set |bytes_read| to 0, return true (1) and execute
// |callback| when the data is available (|data_out| will remain valid until /// |callback| when the data is available (|data_out| will remain valid until
// the callback is executed). To indicate response completion set |bytes_read| /// the callback is executed). To indicate response completion set
// to 0 and return false (0). To indicate failure set |bytes_read| to < 0 /// |bytes_read| to 0 and return false (0). To indicate failure set
// (e.g. -2 for ERR_FAILED) and return false (0). This function will be called /// |bytes_read| to < 0 (e.g. -2 for ERR_FAILED) and return false (0). This
// in sequence but not from a dedicated thread. For backwards compatibility /// function will be called in sequence but not from a dedicated thread. For
// set |bytes_read| to -1 and return false (0) and the ReadResponse function /// backwards compatibility set |bytes_read| to -1 and return false (0) and
// will be called. /// the ReadResponse function will be called.
/// ///
int(CEF_CALLBACK* read)(struct _cef_resource_handler_t* self, int(CEF_CALLBACK* read)(struct _cef_resource_handler_t* self,
void* data_out, void* data_out,
@ -182,13 +183,13 @@ typedef struct _cef_resource_handler_t {
struct _cef_resource_read_callback_t* callback); struct _cef_resource_read_callback_t* callback);
/// ///
// Read response data. If data is available immediately copy up to /// Read response data. If data is available immediately copy up to
// |bytes_to_read| bytes into |data_out|, set |bytes_read| to the number of /// |bytes_to_read| bytes into |data_out|, set |bytes_read| to the number of
// bytes copied, and return true (1). To read the data at a later time set /// bytes copied, and return true (1). To read the data at a later time set
// |bytes_read| to 0, return true (1) and call cef_callback_t::cont() when the /// |bytes_read| to 0, return true (1) and call cef_callback_t::cont() when
// data is available. To indicate response completion return false (0). /// the data is available. To indicate response completion return false (0).
// ///
// WARNING: This function is deprecated. Use Skip and Read instead. /// WARNING: This function is deprecated. Use Skip and Read instead.
/// ///
int(CEF_CALLBACK* read_response)(struct _cef_resource_handler_t* self, int(CEF_CALLBACK* read_response)(struct _cef_resource_handler_t* self,
void* data_out, void* data_out,
@ -197,7 +198,7 @@ typedef struct _cef_resource_handler_t {
struct _cef_callback_t* callback); struct _cef_callback_t* callback);
/// ///
// Request processing has been canceled. /// Request processing has been canceled.
/// ///
void(CEF_CALLBACK* cancel)(struct _cef_resource_handler_t* self); void(CEF_CALLBACK* cancel)(struct _cef_resource_handler_t* self);
} cef_resource_handler_t; } cef_resource_handler_t;

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=3d5c3c54c9f7eedc5cd1dd61c0f69edcd6a1143a$ // $hash=64d090faf64e2ffb99da110840af383b757e113b$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_REQUEST_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_REQUEST_HANDLER_CAPI_H_
@ -56,23 +56,23 @@ extern "C" {
struct _cef_cookie_access_filter_t; struct _cef_cookie_access_filter_t;
/// ///
// Implement this structure to handle events related to browser requests. The /// Implement this structure to handle events related to browser requests. The
// functions of this structure will be called on the IO thread unless otherwise /// functions of this structure will be called on the IO thread unless otherwise
// indicated. /// indicated.
/// ///
typedef struct _cef_resource_request_handler_t { typedef struct _cef_resource_request_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called on the IO thread before a resource request is loaded. The |browser| /// Called on the IO thread before a resource request is loaded. The |browser|
// and |frame| values represent the source of the request, and may be NULL for /// and |frame| values represent the source of the request, and may be NULL
// requests originating from service workers or cef_urlrequest_t. To /// for requests originating from service workers or cef_urlrequest_t. To
// optionally filter cookies for the request return a /// optionally filter cookies for the request return a
// cef_cookie_access_filter_t object. The |request| object cannot not be /// cef_cookie_access_filter_t object. The |request| object cannot not be
// modified in this callback. /// modified in this callback.
/// ///
struct _cef_cookie_access_filter_t*(CEF_CALLBACK* get_cookie_access_filter)( struct _cef_cookie_access_filter_t*(CEF_CALLBACK* get_cookie_access_filter)(
struct _cef_resource_request_handler_t* self, struct _cef_resource_request_handler_t* self,
@ -81,15 +81,15 @@ typedef struct _cef_resource_request_handler_t {
struct _cef_request_t* request); struct _cef_request_t* request);
/// ///
// Called on the IO thread before a resource request is loaded. The |browser| /// Called on the IO thread before a resource request is loaded. The |browser|
// and |frame| values represent the source of the request, and may be NULL for /// and |frame| values represent the source of the request, and may be NULL
// requests originating from service workers or cef_urlrequest_t. To redirect /// for requests originating from service workers or cef_urlrequest_t. To
// or change the resource load optionally modify |request|. Modification of /// redirect or change the resource load optionally modify |request|.
// the request URL will be treated as a redirect. Return RV_CONTINUE to /// Modification of the request URL will be treated as a redirect. Return
// continue the request immediately. Return RV_CONTINUE_ASYNC and call /// RV_CONTINUE to continue the request immediately. Return RV_CONTINUE_ASYNC
// cef_callback_t functions at a later time to continue or cancel the request /// and call cef_callback_t functions at a later time to continue or cancel
// asynchronously. Return RV_CANCEL to cancel the request immediately. /// the request asynchronously. Return RV_CANCEL to cancel the request
// /// immediately.
/// ///
cef_return_value_t(CEF_CALLBACK* on_before_resource_load)( cef_return_value_t(CEF_CALLBACK* on_before_resource_load)(
struct _cef_resource_request_handler_t* self, struct _cef_resource_request_handler_t* self,
@ -99,12 +99,12 @@ typedef struct _cef_resource_request_handler_t {
struct _cef_callback_t* callback); struct _cef_callback_t* callback);
/// ///
// Called on the IO thread before a resource is loaded. The |browser| and /// Called on the IO thread before a resource is loaded. The |browser| and
// |frame| values represent the source of the request, and may be NULL for /// |frame| values represent the source of the request, and may be NULL for
// requests originating from service workers or cef_urlrequest_t. To allow the /// requests originating from service workers or cef_urlrequest_t. To allow
// resource to load using the default network loader return NULL. To specify a /// the resource to load using the default network loader return NULL. To
// handler for the resource return a cef_resource_handler_t object. The /// specify a handler for the resource return a cef_resource_handler_t object.
// |request| object cannot not be modified in this callback. /// The |request| object cannot not be modified in this callback.
/// ///
struct _cef_resource_handler_t*(CEF_CALLBACK* get_resource_handler)( struct _cef_resource_handler_t*(CEF_CALLBACK* get_resource_handler)(
struct _cef_resource_request_handler_t* self, struct _cef_resource_request_handler_t* self,
@ -113,14 +113,14 @@ typedef struct _cef_resource_request_handler_t {
struct _cef_request_t* request); struct _cef_request_t* request);
/// ///
// Called on the IO thread when a resource load is redirected. The |browser| /// Called on the IO thread when a resource load is redirected. The |browser|
// and |frame| values represent the source of the request, and may be NULL for /// and |frame| values represent the source of the request, and may be NULL
// requests originating from service workers or cef_urlrequest_t. The /// for requests originating from service workers or cef_urlrequest_t. The
// |request| parameter will contain the old URL and other request-related /// |request| parameter will contain the old URL and other request-related
// information. The |response| parameter will contain the response that /// information. The |response| parameter will contain the response that
// resulted in the redirect. The |new_url| parameter will contain the new URL /// resulted in the redirect. The |new_url| parameter will contain the new URL
// and can be changed if desired. The |request| and |response| objects cannot /// and can be changed if desired. The |request| and |response| objects cannot
// be modified in this callback. /// be modified in this callback.
/// ///
void(CEF_CALLBACK* on_resource_redirect)( void(CEF_CALLBACK* on_resource_redirect)(
struct _cef_resource_request_handler_t* self, struct _cef_resource_request_handler_t* self,
@ -131,17 +131,18 @@ typedef struct _cef_resource_request_handler_t {
cef_string_t* new_url); cef_string_t* new_url);
/// ///
// Called on the IO thread when a resource response is received. The |browser| /// Called on the IO thread when a resource response is received. The
// and |frame| values represent the source of the request, and may be NULL for /// |browser| and |frame| values represent the source of the request, and may
// requests originating from service workers or cef_urlrequest_t. To allow the /// be NULL for requests originating from service workers or cef_urlrequest_t.
// resource load to proceed without modification return false (0). To redirect /// To allow the resource load to proceed without modification return false
// or retry the resource load optionally modify |request| and return true (1). /// (0). To redirect or retry the resource load optionally modify |request|
// Modification of the request URL will be treated as a redirect. Requests /// and return true (1). Modification of the request URL will be treated as a
// handled using the default network loader cannot be redirected in this /// redirect. Requests handled using the default network loader cannot be
// callback. The |response| object cannot be modified in this callback. /// redirected in this callback. The |response| object cannot be modified in
// /// this callback.
// WARNING: Redirecting using this function is deprecated. Use ///
// OnBeforeResourceLoad or GetResourceHandler to perform redirects. /// WARNING: Redirecting using this function is deprecated. Use
/// OnBeforeResourceLoad or GetResourceHandler to perform redirects.
/// ///
int(CEF_CALLBACK* on_resource_response)( int(CEF_CALLBACK* on_resource_response)(
struct _cef_resource_request_handler_t* self, struct _cef_resource_request_handler_t* self,
@ -151,11 +152,11 @@ typedef struct _cef_resource_request_handler_t {
struct _cef_response_t* response); struct _cef_response_t* response);
/// ///
// Called on the IO thread to optionally filter resource response content. The /// Called on the IO thread to optionally filter resource response content.
// |browser| and |frame| values represent the source of the request, and may /// The |browser| and |frame| values represent the source of the request, and
// be NULL for requests originating from service workers or cef_urlrequest_t. /// may be NULL for requests originating from service workers or
// |request| and |response| represent the request and response respectively /// cef_urlrequest_t. |request| and |response| represent the request and
// and cannot be modified in this callback. /// response respectively and cannot be modified in this callback.
/// ///
struct _cef_response_filter_t*(CEF_CALLBACK* get_resource_response_filter)( struct _cef_response_filter_t*(CEF_CALLBACK* get_resource_response_filter)(
struct _cef_resource_request_handler_t* self, struct _cef_resource_request_handler_t* self,
@ -165,20 +166,20 @@ typedef struct _cef_resource_request_handler_t {
struct _cef_response_t* response); struct _cef_response_t* response);
/// ///
// Called on the IO thread when a resource load has completed. The |browser| /// Called on the IO thread when a resource load has completed. The |browser|
// and |frame| values represent the source of the request, and may be NULL for /// and |frame| values represent the source of the request, and may be NULL
// requests originating from service workers or cef_urlrequest_t. |request| /// for requests originating from service workers or cef_urlrequest_t.
// and |response| represent the request and response respectively and cannot /// |request| and |response| represent the request and response respectively
// be modified in this callback. |status| indicates the load completion /// and cannot be modified in this callback. |status| indicates the load
// status. |received_content_length| is the number of response bytes actually /// completion status. |received_content_length| is the number of response
// read. This function will be called for all requests, including requests /// bytes actually read. This function will be called for all requests,
// that are aborted due to CEF shutdown or destruction of the associated /// including requests that are aborted due to CEF shutdown or destruction of
// browser. In cases where the associated browser is destroyed this callback /// the associated browser. In cases where the associated browser is destroyed
// may arrive after the cef_life_span_handler_t::OnBeforeClose callback for /// this callback may arrive after the cef_life_span_handler_t::OnBeforeClose
// that browser. The cef_frame_t::IsValid function can be used to test for /// callback for that browser. The cef_frame_t::IsValid function can be used
// this situation, and care should be taken not to call |browser| or |frame| /// to test for this situation, and care should be taken not to call |browser|
// functions that modify state (like LoadURL, SendProcessMessage, etc.) if the /// or |frame| functions that modify state (like LoadURL, SendProcessMessage,
// frame is invalid. /// etc.) if the frame is invalid.
/// ///
void(CEF_CALLBACK* on_resource_load_complete)( void(CEF_CALLBACK* on_resource_load_complete)(
struct _cef_resource_request_handler_t* self, struct _cef_resource_request_handler_t* self,
@ -190,14 +191,14 @@ typedef struct _cef_resource_request_handler_t {
int64 received_content_length); int64 received_content_length);
/// ///
// Called on the IO thread to handle requests for URLs with an unknown /// Called on the IO thread to handle requests for URLs with an unknown
// protocol component. The |browser| and |frame| values represent the source /// protocol component. The |browser| and |frame| values represent the source
// of the request, and may be NULL for requests originating from service /// of the request, and may be NULL for requests originating from service
// workers or cef_urlrequest_t. |request| cannot be modified in this callback. /// workers or cef_urlrequest_t. |request| cannot be modified in this
// Set |allow_os_execution| to true (1) to attempt execution via the /// callback. Set |allow_os_execution| to true (1) to attempt execution via
// registered OS protocol handler, if any. SECURITY WARNING: YOU SHOULD USE /// the registered OS protocol handler, if any. SECURITY WARNING: YOU SHOULD
// THIS METHOD TO ENFORCE RESTRICTIONS BASED ON SCHEME, HOST OR OTHER URL /// USE THIS METHOD TO ENFORCE RESTRICTIONS BASED ON SCHEME, HOST OR OTHER URL
// ANALYSIS BEFORE ALLOWING OS EXECUTION. /// ANALYSIS BEFORE ALLOWING OS EXECUTION.
/// ///
void(CEF_CALLBACK* on_protocol_execution)( void(CEF_CALLBACK* on_protocol_execution)(
struct _cef_resource_request_handler_t* self, struct _cef_resource_request_handler_t* self,
@ -208,22 +209,22 @@ typedef struct _cef_resource_request_handler_t {
} cef_resource_request_handler_t; } cef_resource_request_handler_t;
/// ///
// Implement this structure to filter cookies that may be sent or received from /// Implement this structure to filter cookies that may be sent or received from
// resource requests. The functions of this structure will be called on the IO /// resource requests. The functions of this structure will be called on the IO
// thread unless otherwise indicated. /// thread unless otherwise indicated.
/// ///
typedef struct _cef_cookie_access_filter_t { typedef struct _cef_cookie_access_filter_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called on the IO thread before a resource request is sent. The |browser| /// Called on the IO thread before a resource request is sent. The |browser|
// and |frame| values represent the source of the request, and may be NULL for /// and |frame| values represent the source of the request, and may be NULL
// requests originating from service workers or cef_urlrequest_t. |request| /// for requests originating from service workers or cef_urlrequest_t.
// cannot be modified in this callback. Return true (1) if the specified /// |request| cannot be modified in this callback. Return true (1) if the
// cookie can be sent with the request or false (0) otherwise. /// specified cookie can be sent with the request or false (0) otherwise.
/// ///
int(CEF_CALLBACK* can_send_cookie)(struct _cef_cookie_access_filter_t* self, int(CEF_CALLBACK* can_send_cookie)(struct _cef_cookie_access_filter_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,
@ -232,12 +233,12 @@ typedef struct _cef_cookie_access_filter_t {
const struct _cef_cookie_t* cookie); const struct _cef_cookie_t* cookie);
/// ///
// Called on the IO thread after a resource response is received. The /// Called on the IO thread after a resource response is received. The
// |browser| and |frame| values represent the source of the request, and may /// |browser| and |frame| values represent the source of the request, and may
// be NULL for requests originating from service workers or cef_urlrequest_t. /// be NULL for requests originating from service workers or cef_urlrequest_t.
// |request| cannot be modified in this callback. Return true (1) if the /// |request| cannot be modified in this callback. Return true (1) if the
// specified cookie returned with the response can be saved or false (0) /// specified cookie returned with the response can be saved or false (0)
// otherwise. /// otherwise.
/// ///
int(CEF_CALLBACK* can_save_cookie)(struct _cef_cookie_access_filter_t* self, int(CEF_CALLBACK* can_save_cookie)(struct _cef_cookie_access_filter_t* self,
struct _cef_browser_t* browser, struct _cef_browser_t* browser,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=ab8832420572dae95a601fb3170fcd3693473619$ // $hash=21354bc7b20a18eb0c25d2aa0abf1211fd9ebcaa$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_RESPONSE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_RESPONSE_CAPI_H_
@ -47,83 +47,83 @@ extern "C" {
#endif #endif
/// ///
// Structure used to represent a web response. The functions of this structure /// Structure used to represent a web response. The functions of this structure
// may be called on any thread. /// may be called on any thread.
/// ///
typedef struct _cef_response_t { typedef struct _cef_response_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is read-only. /// Returns true (1) if this object is read-only.
/// ///
int(CEF_CALLBACK* is_read_only)(struct _cef_response_t* self); int(CEF_CALLBACK* is_read_only)(struct _cef_response_t* self);
/// ///
// Get the response error code. Returns ERR_NONE if there was no error. /// Get the response error code. Returns ERR_NONE if there was no error.
/// ///
cef_errorcode_t(CEF_CALLBACK* get_error)(struct _cef_response_t* self); cef_errorcode_t(CEF_CALLBACK* get_error)(struct _cef_response_t* self);
/// ///
// Set the response error code. This can be used by custom scheme handlers to /// Set the response error code. This can be used by custom scheme handlers to
// return errors during initial request processing. /// return errors during initial request processing.
/// ///
void(CEF_CALLBACK* set_error)(struct _cef_response_t* self, void(CEF_CALLBACK* set_error)(struct _cef_response_t* self,
cef_errorcode_t error); cef_errorcode_t error);
/// ///
// Get the response status code. /// Get the response status code.
/// ///
int(CEF_CALLBACK* get_status)(struct _cef_response_t* self); int(CEF_CALLBACK* get_status)(struct _cef_response_t* self);
/// ///
// Set the response status code. /// Set the response status code.
/// ///
void(CEF_CALLBACK* set_status)(struct _cef_response_t* self, int status); void(CEF_CALLBACK* set_status)(struct _cef_response_t* self, int status);
/// ///
// Get the response status text. /// Get the response status text.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_status_text)( cef_string_userfree_t(CEF_CALLBACK* get_status_text)(
struct _cef_response_t* self); struct _cef_response_t* self);
/// ///
// Set the response status text. /// Set the response status text.
/// ///
void(CEF_CALLBACK* set_status_text)(struct _cef_response_t* self, void(CEF_CALLBACK* set_status_text)(struct _cef_response_t* self,
const cef_string_t* statusText); const cef_string_t* statusText);
/// ///
// Get the response mime type. /// Get the response mime type.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_mime_type)( cef_string_userfree_t(CEF_CALLBACK* get_mime_type)(
struct _cef_response_t* self); struct _cef_response_t* self);
/// ///
// Set the response mime type. /// Set the response mime type.
/// ///
void(CEF_CALLBACK* set_mime_type)(struct _cef_response_t* self, void(CEF_CALLBACK* set_mime_type)(struct _cef_response_t* self,
const cef_string_t* mimeType); const cef_string_t* mimeType);
/// ///
// Get the response charset. /// Get the response charset.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_charset)( cef_string_userfree_t(CEF_CALLBACK* get_charset)(
struct _cef_response_t* self); struct _cef_response_t* self);
/// ///
// Set the response charset. /// Set the response charset.
/// ///
void(CEF_CALLBACK* set_charset)(struct _cef_response_t* self, void(CEF_CALLBACK* set_charset)(struct _cef_response_t* self,
const cef_string_t* charset); const cef_string_t* charset);
/// ///
// Get the value for the specified response header field. /// Get the value for the specified response header field.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_header_by_name)( cef_string_userfree_t(CEF_CALLBACK* get_header_by_name)(
@ -131,9 +131,9 @@ typedef struct _cef_response_t {
const cef_string_t* name); const cef_string_t* name);
/// ///
// Set the header |name| to |value|. If |overwrite| is true (1) any existing /// Set the header |name| to |value|. If |overwrite| is true (1) any existing
// values will be replaced with the new value. If |overwrite| is false (0) any /// values will be replaced with the new value. If |overwrite| is false (0)
// existing values will not be overwritten. /// any existing values will not be overwritten.
/// ///
void(CEF_CALLBACK* set_header_by_name)(struct _cef_response_t* self, void(CEF_CALLBACK* set_header_by_name)(struct _cef_response_t* self,
const cef_string_t* name, const cef_string_t* name,
@ -141,32 +141,32 @@ typedef struct _cef_response_t {
int overwrite); int overwrite);
/// ///
// Get all response header fields. /// Get all response header fields.
/// ///
void(CEF_CALLBACK* get_header_map)(struct _cef_response_t* self, void(CEF_CALLBACK* get_header_map)(struct _cef_response_t* self,
cef_string_multimap_t headerMap); cef_string_multimap_t headerMap);
/// ///
// Set all response header fields. /// Set all response header fields.
/// ///
void(CEF_CALLBACK* set_header_map)(struct _cef_response_t* self, void(CEF_CALLBACK* set_header_map)(struct _cef_response_t* self,
cef_string_multimap_t headerMap); cef_string_multimap_t headerMap);
/// ///
// Get the resolved URL after redirects or changed as a result of HSTS. /// Get the resolved URL after redirects or changed as a result of HSTS.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_url)(struct _cef_response_t* self); cef_string_userfree_t(CEF_CALLBACK* get_url)(struct _cef_response_t* self);
/// ///
// Set the resolved URL after redirects or changed as a result of HSTS. /// Set the resolved URL after redirects or changed as a result of HSTS.
/// ///
void(CEF_CALLBACK* set_url)(struct _cef_response_t* self, void(CEF_CALLBACK* set_url)(struct _cef_response_t* self,
const cef_string_t* url); const cef_string_t* url);
} cef_response_t; } cef_response_t;
/// ///
// Create a new cef_response_t object. /// Create a new cef_response_t object.
/// ///
CEF_EXPORT cef_response_t* cef_response_create(void); CEF_EXPORT cef_response_t* cef_response_create(void);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=fb06b9630b95fedb5d202aab7814d914ab7c943b$ // $hash=cbcb379f7ed86b58e271089a4117267a50f72814$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_RESPONSE_FILTER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_RESPONSE_FILTER_CAPI_H_
@ -47,51 +47,51 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to filter resource response content. The functions /// Implement this structure to filter resource response content. The functions
// of this structure will be called on the browser process IO thread. /// of this structure will be called on the browser process IO thread.
/// ///
typedef struct _cef_response_filter_t { typedef struct _cef_response_filter_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Initialize the response filter. Will only be called a single time. The /// Initialize the response filter. Will only be called a single time. The
// filter will not be installed if this function returns false (0). /// filter will not be installed if this function returns false (0).
/// ///
int(CEF_CALLBACK* init_filter)(struct _cef_response_filter_t* self); int(CEF_CALLBACK* init_filter)(struct _cef_response_filter_t* self);
/// ///
// Called to filter a chunk of data. Expected usage is as follows: /// Called to filter a chunk of data. Expected usage is as follows:
// ///
// A. Read input data from |data_in| and set |data_in_read| to the number of /// 1. Read input data from |data_in| and set |data_in_read| to the number of
// bytes that were read up to a maximum of |data_in_size|. |data_in| will /// bytes that were read up to a maximum of |data_in_size|. |data_in| will
// be NULL if |data_in_size| is zero. /// be NULL if |data_in_size| is zero.
// B. Write filtered output data to |data_out| and set |data_out_written| to /// 2. Write filtered output data to |data_out| and set |data_out_written| to
// the number of bytes that were written up to a maximum of /// the number of bytes that were written up to a maximum of
// |data_out_size|. If no output data was written then all data must be /// |data_out_size|. If no output data was written then all data must be
// read from |data_in| (user must set |data_in_read| = |data_in_size|). /// read from |data_in| (user must set |data_in_read| = |data_in_size|).
// C. Return RESPONSE_FILTER_DONE if all output data was written or /// 3. Return RESPONSE_FILTER_DONE if all output data was written or
// RESPONSE_FILTER_NEED_MORE_DATA if output data is still pending. /// RESPONSE_FILTER_NEED_MORE_DATA if output data is still pending.
// ///
// This function will be called repeatedly until the input buffer has been /// This function will be called repeatedly until the input buffer has been
// fully read (user sets |data_in_read| = |data_in_size|) and there is no more /// fully read (user sets |data_in_read| = |data_in_size|) and there is no
// input data to filter (the resource response is complete). This function may /// more input data to filter (the resource response is complete). This
// then be called an additional time with an NULL input buffer if the user /// function may then be called an additional time with an NULL input buffer
// filled the output buffer (set |data_out_written| = |data_out_size|) and /// if the user filled the output buffer (set |data_out_written| =
// returned RESPONSE_FILTER_NEED_MORE_DATA to indicate that output data is /// |data_out_size|) and returned RESPONSE_FILTER_NEED_MORE_DATA to indicate
// still pending. /// that output data is still pending.
// ///
// Calls to this function will stop when one of the following conditions is /// Calls to this function will stop when one of the following conditions is
// met: /// met:
// ///
// A. There is no more input data to filter (the resource response is /// 1. There is no more input data to filter (the resource response is
// complete) and the user sets |data_out_written| = 0 or returns /// complete) and the user sets |data_out_written| = 0 or returns
// RESPONSE_FILTER_DONE to indicate that all data has been written, or; /// RESPONSE_FILTER_DONE to indicate that all data has been written, or;
// B. The user returns RESPONSE_FILTER_ERROR to indicate an error. /// 2. The user returns RESPONSE_FILTER_ERROR to indicate an error.
// ///
// Do not keep a reference to the buffers passed to this function. /// Do not keep a reference to the buffers passed to this function.
/// ///
cef_response_filter_status_t(CEF_CALLBACK* filter)( cef_response_filter_status_t(CEF_CALLBACK* filter)(
struct _cef_response_filter_t* self, struct _cef_response_filter_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=83cbe91e85d7ab2413f733b75457ce6689d3d0ae$ // $hash=1b6cd9a13f93867b1f20418bfa4c7db8b5e6725d$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_SCHEME_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_SCHEME_CAPI_H_
@ -54,23 +54,23 @@ extern "C" {
struct _cef_scheme_handler_factory_t; struct _cef_scheme_handler_factory_t;
/// ///
// Structure that manages custom scheme registrations. /// Structure that manages custom scheme registrations.
/// ///
typedef struct _cef_scheme_registrar_t { typedef struct _cef_scheme_registrar_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_scoped_t base; cef_base_scoped_t base;
/// ///
// Register a custom scheme. This function should not be called for the built- /// Register a custom scheme. This function should not be called for the
// in HTTP, HTTPS, FILE, FTP, ABOUT and DATA schemes. /// built-in HTTP, HTTPS, FILE, FTP, ABOUT and DATA schemes.
// ///
// See cef_scheme_options_t for possible values for |options|. /// See cef_scheme_options_t for possible values for |options|.
// ///
// This function may be called on any thread. It should only be called once /// This function may be called on any thread. It should only be called once
// per unique |scheme_name| value. If |scheme_name| is already registered or /// per unique |scheme_name| value. If |scheme_name| is already registered or
// if an error occurs this function will return false (0). /// if an error occurs this function will return false (0).
/// ///
int(CEF_CALLBACK* add_custom_scheme)(struct _cef_scheme_registrar_t* self, int(CEF_CALLBACK* add_custom_scheme)(struct _cef_scheme_registrar_t* self,
const cef_string_t* scheme_name, const cef_string_t* scheme_name,
@ -78,23 +78,23 @@ typedef struct _cef_scheme_registrar_t {
} cef_scheme_registrar_t; } cef_scheme_registrar_t;
/// ///
// Structure that creates cef_resource_handler_t instances for handling scheme /// Structure that creates cef_resource_handler_t instances for handling scheme
// requests. The functions of this structure will always be called on the IO /// requests. The functions of this structure will always be called on the IO
// thread. /// thread.
/// ///
typedef struct _cef_scheme_handler_factory_t { typedef struct _cef_scheme_handler_factory_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Return a new resource handler instance to handle the request or an NULL /// Return a new resource handler instance to handle the request or an NULL
// reference to allow default handling of the request. |browser| and |frame| /// reference to allow default handling of the request. |browser| and |frame|
// will be the browser window and frame respectively that originated the /// will be the browser window and frame respectively that originated the
// request or NULL if the request did not originate from a browser window (for /// request or NULL if the request did not originate from a browser window
// example, if the request came from cef_urlrequest_t). The |request| object /// (for example, if the request came from cef_urlrequest_t). The |request|
// passed to this function cannot be modified. /// object passed to this function cannot be modified.
/// ///
struct _cef_resource_handler_t*(CEF_CALLBACK* create)( struct _cef_resource_handler_t*(CEF_CALLBACK* create)(
struct _cef_scheme_handler_factory_t* self, struct _cef_scheme_handler_factory_t* self,
@ -105,19 +105,19 @@ typedef struct _cef_scheme_handler_factory_t {
} cef_scheme_handler_factory_t; } cef_scheme_handler_factory_t;
/// ///
// Register a scheme handler factory with the global request context. An NULL /// Register a scheme handler factory with the global request context. An NULL
// |domain_name| value for a standard scheme will cause the factory to match all /// |domain_name| value for a standard scheme will cause the factory to match
// domain names. The |domain_name| value will be ignored for non-standard /// all domain names. The |domain_name| value will be ignored for non-standard
// schemes. If |scheme_name| is a built-in scheme and no handler is returned by /// schemes. If |scheme_name| is a built-in scheme and no handler is returned by
// |factory| then the built-in scheme handler factory will be called. If /// |factory| then the built-in scheme handler factory will be called. If
// |scheme_name| is a custom scheme then you must also implement the /// |scheme_name| is a custom scheme then you must also implement the
// cef_app_t::on_register_custom_schemes() function in all processes. This /// cef_app_t::on_register_custom_schemes() function in all processes. This
// function may be called multiple times to change or remove the factory that /// function may be called multiple times to change or remove the factory that
// matches the specified |scheme_name| and optional |domain_name|. Returns false /// matches the specified |scheme_name| and optional |domain_name|. Returns
// (0) if an error occurs. This function may be called on any thread in the /// false (0) if an error occurs. This function may be called on any thread in
// browser process. Using this function is equivalent to calling cef_request_con /// the browser process. Using this function is equivalent to calling cef_reques
// text_t::cef_request_context_get_global_context()->register_scheme_handler_fac /// t_context_t::cef_request_context_get_global_context()->register_scheme_handl
// tory(). /// er_factory().
/// ///
CEF_EXPORT int cef_register_scheme_handler_factory( CEF_EXPORT int cef_register_scheme_handler_factory(
const cef_string_t* scheme_name, const cef_string_t* scheme_name,
@ -125,11 +125,11 @@ CEF_EXPORT int cef_register_scheme_handler_factory(
cef_scheme_handler_factory_t* factory); cef_scheme_handler_factory_t* factory);
/// ///
// Clear all scheme handler factories registered with the global request /// Clear all scheme handler factories registered with the global request
// context. Returns false (0) on error. This function may be called on any /// context. Returns false (0) on error. This function may be called on any
// thread in the browser process. Using this function is equivalent to calling c /// thread in the browser process. Using this function is equivalent to calling
// ef_request_context_t::cef_request_context_get_global_context()->clear_scheme_ /// cef_request_context_t::cef_request_context_get_global_context()->clear_schem
// handler_factories(). /// e_handler_factories().
/// ///
CEF_EXPORT int cef_clear_scheme_handler_factories(void); CEF_EXPORT int cef_clear_scheme_handler_factories(void);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=72c2b4f976016cea50e54a386c09a786973c01a3$ // $hash=4d76765604a96b026076f1c930a33d616f23b4ad$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_SERVER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_SERVER_CAPI_H_
@ -52,64 +52,64 @@ extern "C" {
struct _cef_server_handler_t; struct _cef_server_handler_t;
/// ///
// Structure representing a server that supports HTTP and WebSocket requests. /// Structure representing a server that supports HTTP and WebSocket requests.
// Server capacity is limited and is intended to handle only a small number of /// Server capacity is limited and is intended to handle only a small number of
// simultaneous connections (e.g. for communicating between applications on /// simultaneous connections (e.g. for communicating between applications on
// localhost). The functions of this structure are safe to call from any thread /// localhost). The functions of this structure are safe to call from any thread
// in the brower process unless otherwise indicated. /// in the brower process unless otherwise indicated.
/// ///
typedef struct _cef_server_t { typedef struct _cef_server_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns the task runner for the dedicated server thread. /// Returns the task runner for the dedicated server thread.
/// ///
struct _cef_task_runner_t*(CEF_CALLBACK* get_task_runner)( struct _cef_task_runner_t*(CEF_CALLBACK* get_task_runner)(
struct _cef_server_t* self); struct _cef_server_t* self);
/// ///
// Stop the server and shut down the dedicated server thread. See /// Stop the server and shut down the dedicated server thread. See
// cef_server_handler_t::OnServerCreated documentation for a description of /// cef_server_handler_t::OnServerCreated documentation for a description of
// server lifespan. /// server lifespan.
/// ///
void(CEF_CALLBACK* shutdown)(struct _cef_server_t* self); void(CEF_CALLBACK* shutdown)(struct _cef_server_t* self);
/// ///
// Returns true (1) if the server is currently running and accepting incoming /// Returns true (1) if the server is currently running and accepting incoming
// connections. See cef_server_handler_t::OnServerCreated documentation for a /// connections. See cef_server_handler_t::OnServerCreated documentation for a
// description of server lifespan. This function must be called on the /// description of server lifespan. This function must be called on the
// dedicated server thread. /// dedicated server thread.
/// ///
int(CEF_CALLBACK* is_running)(struct _cef_server_t* self); int(CEF_CALLBACK* is_running)(struct _cef_server_t* self);
/// ///
// Returns the server address including the port number. /// Returns the server address including the port number.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_address)(struct _cef_server_t* self); cef_string_userfree_t(CEF_CALLBACK* get_address)(struct _cef_server_t* self);
/// ///
// Returns true (1) if the server currently has a connection. This function /// Returns true (1) if the server currently has a connection. This function
// must be called on the dedicated server thread. /// must be called on the dedicated server thread.
/// ///
int(CEF_CALLBACK* has_connection)(struct _cef_server_t* self); int(CEF_CALLBACK* has_connection)(struct _cef_server_t* self);
/// ///
// Returns true (1) if |connection_id| represents a valid connection. This /// Returns true (1) if |connection_id| represents a valid connection. This
// function must be called on the dedicated server thread. /// function must be called on the dedicated server thread.
/// ///
int(CEF_CALLBACK* is_valid_connection)(struct _cef_server_t* self, int(CEF_CALLBACK* is_valid_connection)(struct _cef_server_t* self,
int connection_id); int connection_id);
/// ///
// Send an HTTP 200 "OK" response to the connection identified by /// Send an HTTP 200 "OK" response to the connection identified by
// |connection_id|. |content_type| is the response content type (e.g. /// |connection_id|. |content_type| is the response content type (e.g.
// "text/html"), |data| is the response content, and |data_size| is the size /// "text/html"), |data| is the response content, and |data_size| is the size
// of |data| in bytes. The contents of |data| will be copied. The connection /// of |data| in bytes. The contents of |data| will be copied. The connection
// will be closed automatically after the response is sent. /// will be closed automatically after the response is sent.
/// ///
void(CEF_CALLBACK* send_http200response)(struct _cef_server_t* self, void(CEF_CALLBACK* send_http200response)(struct _cef_server_t* self,
int connection_id, int connection_id,
@ -118,36 +118,36 @@ typedef struct _cef_server_t {
size_t data_size); size_t data_size);
/// ///
// Send an HTTP 404 "Not Found" response to the connection identified by /// Send an HTTP 404 "Not Found" response to the connection identified by
// |connection_id|. The connection will be closed automatically after the /// |connection_id|. The connection will be closed automatically after the
// response is sent. /// response is sent.
/// ///
void(CEF_CALLBACK* send_http404response)(struct _cef_server_t* self, void(CEF_CALLBACK* send_http404response)(struct _cef_server_t* self,
int connection_id); int connection_id);
/// ///
// Send an HTTP 500 "Internal Server Error" response to the connection /// Send an HTTP 500 "Internal Server Error" response to the connection
// identified by |connection_id|. |error_message| is the associated error /// identified by |connection_id|. |error_message| is the associated error
// message. The connection will be closed automatically after the response is /// message. The connection will be closed automatically after the response is
// sent. /// sent.
/// ///
void(CEF_CALLBACK* send_http500response)(struct _cef_server_t* self, void(CEF_CALLBACK* send_http500response)(struct _cef_server_t* self,
int connection_id, int connection_id,
const cef_string_t* error_message); const cef_string_t* error_message);
/// ///
// Send a custom HTTP response to the connection identified by /// Send a custom HTTP response to the connection identified by
// |connection_id|. |response_code| is the HTTP response code sent in the /// |connection_id|. |response_code| is the HTTP response code sent in the
// status line (e.g. 200), |content_type| is the response content type sent as /// status line (e.g. 200), |content_type| is the response content type sent
// the "Content-Type" header (e.g. "text/html"), |content_length| is the /// as the "Content-Type" header (e.g. "text/html"), |content_length| is the
// expected content length, and |extra_headers| is the map of extra response /// expected content length, and |extra_headers| is the map of extra response
// headers. If |content_length| is >= 0 then the "Content-Length" header will /// headers. If |content_length| is >= 0 then the "Content-Length" header will
// be sent. If |content_length| is 0 then no content is expected and the /// be sent. If |content_length| is 0 then no content is expected and the
// connection will be closed automatically after the response is sent. If /// connection will be closed automatically after the response is sent. If
// |content_length| is < 0 then no "Content-Length" header will be sent and /// |content_length| is < 0 then no "Content-Length" header will be sent and
// the client will continue reading until the connection is closed. Use the /// the client will continue reading until the connection is closed. Use the
// SendRawData function to send the content, if applicable, and call /// SendRawData function to send the content, if applicable, and call
// CloseConnection after all content has been sent. /// CloseConnection after all content has been sent.
/// ///
void(CEF_CALLBACK* send_http_response)(struct _cef_server_t* self, void(CEF_CALLBACK* send_http_response)(struct _cef_server_t* self,
int connection_id, int connection_id,
@ -157,12 +157,12 @@ typedef struct _cef_server_t {
cef_string_multimap_t extra_headers); cef_string_multimap_t extra_headers);
/// ///
// Send raw data directly to the connection identified by |connection_id|. /// Send raw data directly to the connection identified by |connection_id|.
// |data| is the raw data and |data_size| is the size of |data| in bytes. The /// |data| is the raw data and |data_size| is the size of |data| in bytes. The
// contents of |data| will be copied. No validation of |data| is performed /// contents of |data| will be copied. No validation of |data| is performed
// internally so the client should be careful to send the amount indicated by /// internally so the client should be careful to send the amount indicated by
// the "Content-Length" header, if specified. See SendHttpResponse /// the "Content-Length" header, if specified. See SendHttpResponse
// documentation for intended usage. /// documentation for intended usage.
/// ///
void(CEF_CALLBACK* send_raw_data)(struct _cef_server_t* self, void(CEF_CALLBACK* send_raw_data)(struct _cef_server_t* self,
int connection_id, int connection_id,
@ -170,17 +170,17 @@ typedef struct _cef_server_t {
size_t data_size); size_t data_size);
/// ///
// Close the connection identified by |connection_id|. See SendHttpResponse /// Close the connection identified by |connection_id|. See SendHttpResponse
// documentation for intended usage. /// documentation for intended usage.
/// ///
void(CEF_CALLBACK* close_connection)(struct _cef_server_t* self, void(CEF_CALLBACK* close_connection)(struct _cef_server_t* self,
int connection_id); int connection_id);
/// ///
// Send a WebSocket message to the connection identified by |connection_id|. /// Send a WebSocket message to the connection identified by |connection_id|.
// |data| is the response content and |data_size| is the size of |data| in /// |data| is the response content and |data_size| is the size of |data| in
// bytes. The contents of |data| will be copied. See /// bytes. The contents of |data| will be copied. See
// cef_server_handler_t::OnWebSocketRequest documentation for intended usage. /// cef_server_handler_t::OnWebSocketRequest documentation for intended usage.
/// ///
void(CEF_CALLBACK* send_web_socket_message)(struct _cef_server_t* self, void(CEF_CALLBACK* send_web_socket_message)(struct _cef_server_t* self,
int connection_id, int connection_id,
@ -189,18 +189,18 @@ typedef struct _cef_server_t {
} cef_server_t; } cef_server_t;
/// ///
// Create a new server that binds to |address| and |port|. |address| must be a /// Create a new server that binds to |address| and |port|. |address| must be a
// valid IPv4 or IPv6 address (e.g. 127.0.0.1 or ::1) and |port| must be a port /// valid IPv4 or IPv6 address (e.g. 127.0.0.1 or ::1) and |port| must be a port
// number outside of the reserved range (e.g. between 1025 and 65535 on most /// number outside of the reserved range (e.g. between 1025 and 65535 on most
// platforms). |backlog| is the maximum number of pending connections. A new /// platforms). |backlog| is the maximum number of pending connections. A new
// thread will be created for each CreateServer call (the "dedicated server /// thread will be created for each CreateServer call (the "dedicated server
// thread"). It is therefore recommended to use a different cef_server_handler_t /// thread"). It is therefore recommended to use a different
// instance for each CreateServer call to avoid thread safety issues in the /// cef_server_handler_t instance for each CreateServer call to avoid thread
// cef_server_handler_t implementation. The /// safety issues in the cef_server_handler_t implementation. The
// cef_server_handler_t::OnServerCreated function will be called on the /// cef_server_handler_t::OnServerCreated function will be called on the
// dedicated server thread to report success or failure. See /// dedicated server thread to report success or failure. See
// cef_server_handler_t::OnServerCreated documentation for a description of /// cef_server_handler_t::OnServerCreated documentation for a description of
// server lifespan. /// server lifespan.
/// ///
CEF_EXPORT void cef_server_create(const cef_string_t* address, CEF_EXPORT void cef_server_create(const cef_string_t* address,
uint16 port, uint16 port,
@ -208,66 +208,67 @@ CEF_EXPORT void cef_server_create(const cef_string_t* address,
struct _cef_server_handler_t* handler); struct _cef_server_handler_t* handler);
/// ///
// Implement this structure to handle HTTP server requests. A new thread will be /// Implement this structure to handle HTTP server requests. A new thread will
// created for each cef_server_t::CreateServer call (the "dedicated server /// be created for each cef_server_t::CreateServer call (the "dedicated server
// thread"), and the functions of this structure will be called on that thread. /// thread"), and the functions of this structure will be called on that thread.
// It is therefore recommended to use a different cef_server_handler_t instance /// It is therefore recommended to use a different cef_server_handler_t instance
// for each cef_server_t::CreateServer call to avoid thread safety issues in the /// for each cef_server_t::CreateServer call to avoid thread safety issues in
// cef_server_handler_t implementation. /// the cef_server_handler_t implementation.
/// ///
typedef struct _cef_server_handler_t { typedef struct _cef_server_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called when |server| is created. If the server was started successfully /// Called when |server| is created. If the server was started successfully
// then cef_server_t::IsRunning will return true (1). The server will continue /// then cef_server_t::IsRunning will return true (1). The server will
// running until cef_server_t::Shutdown is called, after which time /// continue running until cef_server_t::Shutdown is called, after which time
// OnServerDestroyed will be called. If the server failed to start then /// OnServerDestroyed will be called. If the server failed to start then
// OnServerDestroyed will be called immediately after this function returns. /// OnServerDestroyed will be called immediately after this function returns.
/// ///
void(CEF_CALLBACK* on_server_created)(struct _cef_server_handler_t* self, void(CEF_CALLBACK* on_server_created)(struct _cef_server_handler_t* self,
struct _cef_server_t* server); struct _cef_server_t* server);
/// ///
// Called when |server| is destroyed. The server thread will be stopped after /// Called when |server| is destroyed. The server thread will be stopped after
// this function returns. The client should release any references to |server| /// this function returns. The client should release any references to
// when this function is called. See OnServerCreated documentation for a /// |server| when this function is called. See OnServerCreated documentation
// description of server lifespan. /// for a description of server lifespan.
/// ///
void(CEF_CALLBACK* on_server_destroyed)(struct _cef_server_handler_t* self, void(CEF_CALLBACK* on_server_destroyed)(struct _cef_server_handler_t* self,
struct _cef_server_t* server); struct _cef_server_t* server);
/// ///
// Called when a client connects to |server|. |connection_id| uniquely /// Called when a client connects to |server|. |connection_id| uniquely
// identifies the connection. Each call to this function will have a matching /// identifies the connection. Each call to this function will have a matching
// call to OnClientDisconnected. /// call to OnClientDisconnected.
/// ///
void(CEF_CALLBACK* on_client_connected)(struct _cef_server_handler_t* self, void(CEF_CALLBACK* on_client_connected)(struct _cef_server_handler_t* self,
struct _cef_server_t* server, struct _cef_server_t* server,
int connection_id); int connection_id);
/// ///
// Called when a client disconnects from |server|. |connection_id| uniquely /// Called when a client disconnects from |server|. |connection_id| uniquely
// identifies the connection. The client should release any data associated /// identifies the connection. The client should release any data associated
// with |connection_id| when this function is called and |connection_id| /// with |connection_id| when this function is called and |connection_id|
// should no longer be passed to cef_server_t functions. Disconnects can /// should no longer be passed to cef_server_t functions. Disconnects can
// originate from either the client or the server. For example, the server /// originate from either the client or the server. For example, the server
// will disconnect automatically after a cef_server_t::SendHttpXXXResponse /// will disconnect automatically after a cef_server_t::SendHttpXXXResponse
// function is called. /// function is called.
/// ///
void(CEF_CALLBACK* on_client_disconnected)(struct _cef_server_handler_t* self, void(CEF_CALLBACK* on_client_disconnected)(struct _cef_server_handler_t* self,
struct _cef_server_t* server, struct _cef_server_t* server,
int connection_id); int connection_id);
/// ///
// Called when |server| receives an HTTP request. |connection_id| uniquely /// Called when |server| receives an HTTP request. |connection_id| uniquely
// identifies the connection, |client_address| is the requesting IPv4 or IPv6 /// identifies the connection, |client_address| is the requesting IPv4 or IPv6
// client address including port number, and |request| contains the request /// client address including port number, and |request| contains the request
// contents (URL, function, headers and optional POST data). Call cef_server_t /// contents (URL, function, headers and optional POST data). Call
// functions either synchronously or asynchronusly to send a response. /// cef_server_t functions either synchronously or asynchronusly to send a
/// response.
/// ///
void(CEF_CALLBACK* on_http_request)(struct _cef_server_handler_t* self, void(CEF_CALLBACK* on_http_request)(struct _cef_server_handler_t* self,
struct _cef_server_t* server, struct _cef_server_t* server,
@ -276,18 +277,18 @@ typedef struct _cef_server_handler_t {
struct _cef_request_t* request); struct _cef_request_t* request);
/// ///
// Called when |server| receives a WebSocket request. |connection_id| uniquely /// Called when |server| receives a WebSocket request. |connection_id|
// identifies the connection, |client_address| is the requesting IPv4 or IPv6 /// uniquely identifies the connection, |client_address| is the requesting
// client address including port number, and |request| contains the request /// IPv4 or IPv6 client address including port number, and |request| contains
// contents (URL, function, headers and optional POST data). Execute /// the request contents (URL, function, headers and optional POST data).
// |callback| either synchronously or asynchronously to accept or decline the /// Execute |callback| either synchronously or asynchronously to accept or
// WebSocket connection. If the request is accepted then OnWebSocketConnected /// decline the WebSocket connection. If the request is accepted then
// will be called after the WebSocket has connected and incoming messages will /// OnWebSocketConnected will be called after the WebSocket has connected and
// be delivered to the OnWebSocketMessage callback. If the request is declined /// incoming messages will be delivered to the OnWebSocketMessage callback. If
// then the client will be disconnected and OnClientDisconnected will be /// the request is declined then the client will be disconnected and
// called. Call the cef_server_t::SendWebSocketMessage function after /// OnClientDisconnected will be called. Call the
// receiving the OnWebSocketConnected callback to respond with WebSocket /// cef_server_t::SendWebSocketMessage function after receiving the
// messages. /// OnWebSocketConnected callback to respond with WebSocket messages.
/// ///
void(CEF_CALLBACK* on_web_socket_request)(struct _cef_server_handler_t* self, void(CEF_CALLBACK* on_web_socket_request)(struct _cef_server_handler_t* self,
struct _cef_server_t* server, struct _cef_server_t* server,
@ -297,9 +298,9 @@ typedef struct _cef_server_handler_t {
struct _cef_callback_t* callback); struct _cef_callback_t* callback);
/// ///
// Called after the client has accepted the WebSocket connection for |server| /// Called after the client has accepted the WebSocket connection for |server|
// and |connection_id| via the OnWebSocketRequest callback. See /// and |connection_id| via the OnWebSocketRequest callback. See
// OnWebSocketRequest documentation for intended usage. /// OnWebSocketRequest documentation for intended usage.
/// ///
void(CEF_CALLBACK* on_web_socket_connected)( void(CEF_CALLBACK* on_web_socket_connected)(
struct _cef_server_handler_t* self, struct _cef_server_handler_t* self,
@ -307,11 +308,11 @@ typedef struct _cef_server_handler_t {
int connection_id); int connection_id);
/// ///
// Called when |server| receives an WebSocket message. |connection_id| /// Called when |server| receives an WebSocket message. |connection_id|
// uniquely identifies the connection, |data| is the message content and /// uniquely identifies the connection, |data| is the message content and
// |data_size| is the size of |data| in bytes. Do not keep a reference to /// |data_size| is the size of |data| in bytes. Do not keep a reference to
// |data| outside of this function. See OnWebSocketRequest documentation for /// |data| outside of this function. See OnWebSocketRequest documentation for
// intended usage. /// intended usage.
/// ///
void(CEF_CALLBACK* on_web_socket_message)(struct _cef_server_handler_t* self, void(CEF_CALLBACK* on_web_socket_message)(struct _cef_server_handler_t* self,
struct _cef_server_t* server, struct _cef_server_t* server,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=212f13ac6baeeefb86f1648d1e18ccba95fd5f79$ // $hash=5f69190b21f9fa17e6fb4c2284968f8ec5b147ed$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_SHARED_MEMORY_REGION_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_SHARED_MEMORY_REGION_CAPI_H_
@ -47,27 +47,27 @@ extern "C" {
#endif #endif
/// ///
// Structure that wraps platform-dependent share memory region mapping. /// Structure that wraps platform-dependent share memory region mapping.
/// ///
typedef struct _cef_shared_memory_region_t { typedef struct _cef_shared_memory_region_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if the mapping is valid. /// Returns true (1) if the mapping is valid.
/// ///
int(CEF_CALLBACK* is_valid)(struct _cef_shared_memory_region_t* self); int(CEF_CALLBACK* is_valid)(struct _cef_shared_memory_region_t* self);
/// ///
// Returns the size of the mapping in bytes. Returns 0 for invalid instances. /// Returns the size of the mapping in bytes. Returns 0 for invalid instances.
/// ///
size_t(CEF_CALLBACK* size)(struct _cef_shared_memory_region_t* self); size_t(CEF_CALLBACK* size)(struct _cef_shared_memory_region_t* self);
/// ///
// Returns the pointer to the memory. Returns nullptr for invalid instances. /// Returns the pointer to the memory. Returns nullptr for invalid instances.
// The returned pointer is only valid for the life span of this object. /// The returned pointer is only valid for the life span of this object.
/// ///
const void*(CEF_CALLBACK* memory)(struct _cef_shared_memory_region_t* self); const void*(CEF_CALLBACK* memory)(struct _cef_shared_memory_region_t* self);
} cef_shared_memory_region_t; } cef_shared_memory_region_t;

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=0ed88d26dab045ebef0f4f4ae209e7f11206a242$ // $hash=66198e92ec123e753bb427a0b92d73672610136e$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_SHARED_PROCESS_MESSAGE_BUILDER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_SHARED_PROCESS_MESSAGE_BUILDER_CAPI_H_
@ -47,48 +47,48 @@ extern "C" {
#endif #endif
/// ///
// Structure that builds a cef_process_message_t containing a shared memory /// Structure that builds a cef_process_message_t containing a shared memory
// region. This structure is not thread-safe but may be used exclusively on a /// region. This structure is not thread-safe but may be used exclusively on a
// different thread from the one which constructed it. /// different thread from the one which constructed it.
/// ///
typedef struct _cef_shared_process_message_builder_t { typedef struct _cef_shared_process_message_builder_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if the builder is valid. /// Returns true (1) if the builder is valid.
/// ///
int(CEF_CALLBACK* is_valid)( int(CEF_CALLBACK* is_valid)(
struct _cef_shared_process_message_builder_t* self); struct _cef_shared_process_message_builder_t* self);
/// ///
// Returns the size of the shared memory region in bytes. Returns 0 for /// Returns the size of the shared memory region in bytes. Returns 0 for
// invalid instances. /// invalid instances.
/// ///
size_t(CEF_CALLBACK* size)( size_t(CEF_CALLBACK* size)(
struct _cef_shared_process_message_builder_t* self); struct _cef_shared_process_message_builder_t* self);
/// ///
// Returns the pointer to the writable memory. Returns nullptr for invalid /// Returns the pointer to the writable memory. Returns nullptr for invalid
// instances. The returned pointer is only valid for the life span of this /// instances. The returned pointer is only valid for the life span of this
// object. /// object.
/// ///
void*(CEF_CALLBACK* memory)( void*(CEF_CALLBACK* memory)(
struct _cef_shared_process_message_builder_t* self); struct _cef_shared_process_message_builder_t* self);
/// ///
// Creates a new cef_process_message_t from the data provided to the builder. /// Creates a new cef_process_message_t from the data provided to the builder.
// Returns nullptr for invalid instances. Invalidates the builder instance. /// Returns nullptr for invalid instances. Invalidates the builder instance.
/// ///
struct _cef_process_message_t*(CEF_CALLBACK* build)( struct _cef_process_message_t*(CEF_CALLBACK* build)(
struct _cef_shared_process_message_builder_t* self); struct _cef_shared_process_message_builder_t* self);
} cef_shared_process_message_builder_t; } cef_shared_process_message_builder_t;
/// ///
// Creates a new cef_shared_process_message_builder_t with the specified |name| /// Creates a new cef_shared_process_message_builder_t with the specified |name|
// and shared memory region of specified |byte_size|. /// and shared memory region of specified |byte_size|.
/// ///
CEF_EXPORT cef_shared_process_message_builder_t* CEF_EXPORT cef_shared_process_message_builder_t*
cef_shared_process_message_builder_create(const cef_string_t* name, cef_shared_process_message_builder_create(const cef_string_t* name,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=d72f3b34b4150f29f1491b2c729f4a8afc4a33f4$ // $hash=64d6affe3e8e45869403f829c2aa86026773a17b$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_SSL_INFO_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_SSL_INFO_CAPI_H_
@ -49,29 +49,29 @@ extern "C" {
#endif #endif
/// ///
// Structure representing SSL information. /// Structure representing SSL information.
/// ///
typedef struct _cef_sslinfo_t { typedef struct _cef_sslinfo_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns a bitmask containing any and all problems verifying the server /// Returns a bitmask containing any and all problems verifying the server
// certificate. /// certificate.
/// ///
cef_cert_status_t(CEF_CALLBACK* get_cert_status)(struct _cef_sslinfo_t* self); cef_cert_status_t(CEF_CALLBACK* get_cert_status)(struct _cef_sslinfo_t* self);
/// ///
// Returns the X.509 certificate. /// Returns the X.509 certificate.
/// ///
struct _cef_x509certificate_t*(CEF_CALLBACK* get_x509certificate)( struct _cef_x509certificate_t*(CEF_CALLBACK* get_x509certificate)(
struct _cef_sslinfo_t* self); struct _cef_sslinfo_t* self);
} cef_sslinfo_t; } cef_sslinfo_t;
/// ///
// Returns true (1) if the certificate status represents an error. /// Returns true (1) if the certificate status represents an error.
/// ///
CEF_EXPORT int cef_is_cert_status_error(cef_cert_status_t status); CEF_EXPORT int cef_is_cert_status_error(cef_cert_status_t status);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=1bc8a73a196fbbb6cec3dd1738b817575b17706d$ // $hash=b40ab326a1bf140859db9288b809a4038833f014$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_SSL_STATUS_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_SSL_STATUS_CAPI_H_
@ -49,40 +49,40 @@ extern "C" {
#endif #endif
/// ///
// Structure representing the SSL information for a navigation entry. /// Structure representing the SSL information for a navigation entry.
/// ///
typedef struct _cef_sslstatus_t { typedef struct _cef_sslstatus_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if the status is related to a secure SSL/TLS connection. /// Returns true (1) if the status is related to a secure SSL/TLS connection.
/// ///
int(CEF_CALLBACK* is_secure_connection)(struct _cef_sslstatus_t* self); int(CEF_CALLBACK* is_secure_connection)(struct _cef_sslstatus_t* self);
/// ///
// Returns a bitmask containing any and all problems verifying the server /// Returns a bitmask containing any and all problems verifying the server
// certificate. /// certificate.
/// ///
cef_cert_status_t(CEF_CALLBACK* get_cert_status)( cef_cert_status_t(CEF_CALLBACK* get_cert_status)(
struct _cef_sslstatus_t* self); struct _cef_sslstatus_t* self);
/// ///
// Returns the SSL version used for the SSL connection. /// Returns the SSL version used for the SSL connection.
/// ///
cef_ssl_version_t(CEF_CALLBACK* get_sslversion)( cef_ssl_version_t(CEF_CALLBACK* get_sslversion)(
struct _cef_sslstatus_t* self); struct _cef_sslstatus_t* self);
/// ///
// Returns a bitmask containing the page security content status. /// Returns a bitmask containing the page security content status.
/// ///
cef_ssl_content_status_t(CEF_CALLBACK* get_content_status)( cef_ssl_content_status_t(CEF_CALLBACK* get_content_status)(
struct _cef_sslstatus_t* self); struct _cef_sslstatus_t* self);
/// ///
// Returns the X.509 certificate. /// Returns the X.509 certificate.
/// ///
struct _cef_x509certificate_t*(CEF_CALLBACK* get_x509certificate)( struct _cef_x509certificate_t*(CEF_CALLBACK* get_x509certificate)(
struct _cef_sslstatus_t* self); struct _cef_sslstatus_t* self);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=87f6cad177614ece33d9574f0f2964e5bb97d613$ // $hash=9ccb4e6ea821c1b98adcc934429d2bf43cf9d8a2$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_STREAM_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_STREAM_CAPI_H_
@ -47,17 +47,17 @@ extern "C" {
#endif #endif
/// ///
// Structure the client can implement to provide a custom stream reader. The /// Structure the client can implement to provide a custom stream reader. The
// functions of this structure may be called on any thread. /// functions of this structure may be called on any thread.
/// ///
typedef struct _cef_read_handler_t { typedef struct _cef_read_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Read raw binary data. /// Read raw binary data.
/// ///
size_t(CEF_CALLBACK* read)(struct _cef_read_handler_t* self, size_t(CEF_CALLBACK* read)(struct _cef_read_handler_t* self,
void* ptr, void* ptr,
@ -65,43 +65,44 @@ typedef struct _cef_read_handler_t {
size_t n); size_t n);
/// ///
// Seek to the specified offset position. |whence| may be any one of SEEK_CUR, /// Seek to the specified offset position. |whence| may be any one of
// SEEK_END or SEEK_SET. Return zero on success and non-zero on failure. /// SEEK_CUR, SEEK_END or SEEK_SET. Return zero on success and non-zero on
/// failure.
/// ///
int(CEF_CALLBACK* seek)(struct _cef_read_handler_t* self, int(CEF_CALLBACK* seek)(struct _cef_read_handler_t* self,
int64 offset, int64 offset,
int whence); int whence);
/// ///
// Return the current offset position. /// Return the current offset position.
/// ///
int64(CEF_CALLBACK* tell)(struct _cef_read_handler_t* self); int64(CEF_CALLBACK* tell)(struct _cef_read_handler_t* self);
/// ///
// Return non-zero if at end of file. /// Return non-zero if at end of file.
/// ///
int(CEF_CALLBACK* eof)(struct _cef_read_handler_t* self); int(CEF_CALLBACK* eof)(struct _cef_read_handler_t* self);
/// ///
// Return true (1) if this handler performs work like accessing the file /// Return true (1) if this handler performs work like accessing the file
// system which may block. Used as a hint for determining the thread to access /// system which may block. Used as a hint for determining the thread to
// the handler from. /// access the handler from.
/// ///
int(CEF_CALLBACK* may_block)(struct _cef_read_handler_t* self); int(CEF_CALLBACK* may_block)(struct _cef_read_handler_t* self);
} cef_read_handler_t; } cef_read_handler_t;
/// ///
// Structure used to read data from a stream. The functions of this structure /// Structure used to read data from a stream. The functions of this structure
// may be called on any thread. /// may be called on any thread.
/// ///
typedef struct _cef_stream_reader_t { typedef struct _cef_stream_reader_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Read raw binary data. /// Read raw binary data.
/// ///
size_t(CEF_CALLBACK* read)(struct _cef_stream_reader_t* self, size_t(CEF_CALLBACK* read)(struct _cef_stream_reader_t* self,
void* ptr, void* ptr,
@ -109,61 +110,62 @@ typedef struct _cef_stream_reader_t {
size_t n); size_t n);
/// ///
// Seek to the specified offset position. |whence| may be any one of SEEK_CUR, /// Seek to the specified offset position. |whence| may be any one of
// SEEK_END or SEEK_SET. Returns zero on success and non-zero on failure. /// SEEK_CUR, SEEK_END or SEEK_SET. Returns zero on success and non-zero on
/// failure.
/// ///
int(CEF_CALLBACK* seek)(struct _cef_stream_reader_t* self, int(CEF_CALLBACK* seek)(struct _cef_stream_reader_t* self,
int64 offset, int64 offset,
int whence); int whence);
/// ///
// Return the current offset position. /// Return the current offset position.
/// ///
int64(CEF_CALLBACK* tell)(struct _cef_stream_reader_t* self); int64(CEF_CALLBACK* tell)(struct _cef_stream_reader_t* self);
/// ///
// Return non-zero if at end of file. /// Return non-zero if at end of file.
/// ///
int(CEF_CALLBACK* eof)(struct _cef_stream_reader_t* self); int(CEF_CALLBACK* eof)(struct _cef_stream_reader_t* self);
/// ///
// Returns true (1) if this reader performs work like accessing the file /// Returns true (1) if this reader performs work like accessing the file
// system which may block. Used as a hint for determining the thread to access /// system which may block. Used as a hint for determining the thread to
// the reader from. /// access the reader from.
/// ///
int(CEF_CALLBACK* may_block)(struct _cef_stream_reader_t* self); int(CEF_CALLBACK* may_block)(struct _cef_stream_reader_t* self);
} cef_stream_reader_t; } cef_stream_reader_t;
/// ///
// Create a new cef_stream_reader_t object from a file. /// Create a new cef_stream_reader_t object from a file.
/// ///
CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_file( CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_file(
const cef_string_t* fileName); const cef_string_t* fileName);
/// ///
// Create a new cef_stream_reader_t object from data. /// Create a new cef_stream_reader_t object from data.
/// ///
CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_data(void* data, CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_data(void* data,
size_t size); size_t size);
/// ///
// Create a new cef_stream_reader_t object from a custom handler. /// Create a new cef_stream_reader_t object from a custom handler.
/// ///
CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_handler( CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_handler(
cef_read_handler_t* handler); cef_read_handler_t* handler);
/// ///
// Structure the client can implement to provide a custom stream writer. The /// Structure the client can implement to provide a custom stream writer. The
// functions of this structure may be called on any thread. /// functions of this structure may be called on any thread.
/// ///
typedef struct _cef_write_handler_t { typedef struct _cef_write_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Write raw binary data. /// Write raw binary data.
/// ///
size_t(CEF_CALLBACK* write)(struct _cef_write_handler_t* self, size_t(CEF_CALLBACK* write)(struct _cef_write_handler_t* self,
const void* ptr, const void* ptr,
@ -171,43 +173,44 @@ typedef struct _cef_write_handler_t {
size_t n); size_t n);
/// ///
// Seek to the specified offset position. |whence| may be any one of SEEK_CUR, /// Seek to the specified offset position. |whence| may be any one of
// SEEK_END or SEEK_SET. Return zero on success and non-zero on failure. /// SEEK_CUR, SEEK_END or SEEK_SET. Return zero on success and non-zero on
/// failure.
/// ///
int(CEF_CALLBACK* seek)(struct _cef_write_handler_t* self, int(CEF_CALLBACK* seek)(struct _cef_write_handler_t* self,
int64 offset, int64 offset,
int whence); int whence);
/// ///
// Return the current offset position. /// Return the current offset position.
/// ///
int64(CEF_CALLBACK* tell)(struct _cef_write_handler_t* self); int64(CEF_CALLBACK* tell)(struct _cef_write_handler_t* self);
/// ///
// Flush the stream. /// Flush the stream.
/// ///
int(CEF_CALLBACK* flush)(struct _cef_write_handler_t* self); int(CEF_CALLBACK* flush)(struct _cef_write_handler_t* self);
/// ///
// Return true (1) if this handler performs work like accessing the file /// Return true (1) if this handler performs work like accessing the file
// system which may block. Used as a hint for determining the thread to access /// system which may block. Used as a hint for determining the thread to
// the handler from. /// access the handler from.
/// ///
int(CEF_CALLBACK* may_block)(struct _cef_write_handler_t* self); int(CEF_CALLBACK* may_block)(struct _cef_write_handler_t* self);
} cef_write_handler_t; } cef_write_handler_t;
/// ///
// Structure used to write data to a stream. The functions of this structure may /// Structure used to write data to a stream. The functions of this structure
// be called on any thread. /// may be called on any thread.
/// ///
typedef struct _cef_stream_writer_t { typedef struct _cef_stream_writer_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Write raw binary data. /// Write raw binary data.
/// ///
size_t(CEF_CALLBACK* write)(struct _cef_stream_writer_t* self, size_t(CEF_CALLBACK* write)(struct _cef_stream_writer_t* self,
const void* ptr, const void* ptr,
@ -215,39 +218,40 @@ typedef struct _cef_stream_writer_t {
size_t n); size_t n);
/// ///
// Seek to the specified offset position. |whence| may be any one of SEEK_CUR, /// Seek to the specified offset position. |whence| may be any one of
// SEEK_END or SEEK_SET. Returns zero on success and non-zero on failure. /// SEEK_CUR, SEEK_END or SEEK_SET. Returns zero on success and non-zero on
/// failure.
/// ///
int(CEF_CALLBACK* seek)(struct _cef_stream_writer_t* self, int(CEF_CALLBACK* seek)(struct _cef_stream_writer_t* self,
int64 offset, int64 offset,
int whence); int whence);
/// ///
// Return the current offset position. /// Return the current offset position.
/// ///
int64(CEF_CALLBACK* tell)(struct _cef_stream_writer_t* self); int64(CEF_CALLBACK* tell)(struct _cef_stream_writer_t* self);
/// ///
// Flush the stream. /// Flush the stream.
/// ///
int(CEF_CALLBACK* flush)(struct _cef_stream_writer_t* self); int(CEF_CALLBACK* flush)(struct _cef_stream_writer_t* self);
/// ///
// Returns true (1) if this writer performs work like accessing the file /// Returns true (1) if this writer performs work like accessing the file
// system which may block. Used as a hint for determining the thread to access /// system which may block. Used as a hint for determining the thread to
// the writer from. /// access the writer from.
/// ///
int(CEF_CALLBACK* may_block)(struct _cef_stream_writer_t* self); int(CEF_CALLBACK* may_block)(struct _cef_stream_writer_t* self);
} cef_stream_writer_t; } cef_stream_writer_t;
/// ///
// Create a new cef_stream_writer_t object for a file. /// Create a new cef_stream_writer_t object for a file.
/// ///
CEF_EXPORT cef_stream_writer_t* cef_stream_writer_create_for_file( CEF_EXPORT cef_stream_writer_t* cef_stream_writer_create_for_file(
const cef_string_t* fileName); const cef_string_t* fileName);
/// ///
// Create a new cef_stream_writer_t object for a custom handler. /// Create a new cef_stream_writer_t object for a custom handler.
/// ///
CEF_EXPORT cef_stream_writer_t* cef_stream_writer_create_for_handler( CEF_EXPORT cef_stream_writer_t* cef_stream_writer_create_for_handler(
cef_write_handler_t* handler); cef_write_handler_t* handler);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=398537ec88bfe902c49908db4a549da297594b70$ // $hash=3940b4c999764eae305984a16c401e302aefddc6$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_STRING_VISITOR_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_STRING_VISITOR_CAPI_H_
@ -47,16 +47,16 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to receive string values asynchronously. /// Implement this structure to receive string values asynchronously.
/// ///
typedef struct _cef_string_visitor_t { typedef struct _cef_string_visitor_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Method that will be executed. /// Method that will be executed.
/// ///
void(CEF_CALLBACK* visit)(struct _cef_string_visitor_t* self, void(CEF_CALLBACK* visit)(struct _cef_string_visitor_t* self,
const cef_string_t* string); const cef_string_t* string);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=2502258e69820d070a9f094d5e587a38e96cc930$ // $hash=a7a4bf5cd4bde87774b8300d25f12b057a5abf60$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_TASK_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_TASK_CAPI_H_
@ -47,70 +47,70 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure for asynchronous task execution. If the task is /// Implement this structure for asynchronous task execution. If the task is
// posted successfully and if the associated message loop is still running then /// posted successfully and if the associated message loop is still running then
// the execute() function will be called on the target thread. If the task fails /// the execute() function will be called on the target thread. If the task
// to post then the task object may be destroyed on the source thread instead of /// fails to post then the task object may be destroyed on the source thread
// the target thread. For this reason be cautious when performing work in the /// instead of the target thread. For this reason be cautious when performing
// task object destructor. /// work in the task object destructor.
/// ///
typedef struct _cef_task_t { typedef struct _cef_task_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Method that will be executed on the target thread. /// Method that will be executed on the target thread.
/// ///
void(CEF_CALLBACK* execute)(struct _cef_task_t* self); void(CEF_CALLBACK* execute)(struct _cef_task_t* self);
} cef_task_t; } cef_task_t;
/// ///
// Structure that asynchronously executes tasks on the associated thread. It is /// Structure that asynchronously executes tasks on the associated thread. It is
// safe to call the functions of this structure on any thread. /// safe to call the functions of this structure on any thread.
// ///
// CEF maintains multiple internal threads that are used for handling different /// CEF maintains multiple internal threads that are used for handling different
// types of tasks in different processes. The cef_thread_id_t definitions in /// types of tasks in different processes. The cef_thread_id_t definitions in
// cef_types.h list the common CEF threads. Task runners are also available for /// cef_types.h list the common CEF threads. Task runners are also available for
// other CEF threads as appropriate (for example, V8 WebWorker threads). /// other CEF threads as appropriate (for example, V8 WebWorker threads).
/// ///
typedef struct _cef_task_runner_t { typedef struct _cef_task_runner_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is pointing to the same task runner as /// Returns true (1) if this object is pointing to the same task runner as
// |that| object. /// |that| object.
/// ///
int(CEF_CALLBACK* is_same)(struct _cef_task_runner_t* self, int(CEF_CALLBACK* is_same)(struct _cef_task_runner_t* self,
struct _cef_task_runner_t* that); struct _cef_task_runner_t* that);
/// ///
// Returns true (1) if this task runner belongs to the current thread. /// Returns true (1) if this task runner belongs to the current thread.
/// ///
int(CEF_CALLBACK* belongs_to_current_thread)(struct _cef_task_runner_t* self); int(CEF_CALLBACK* belongs_to_current_thread)(struct _cef_task_runner_t* self);
/// ///
// Returns true (1) if this task runner is for the specified CEF thread. /// Returns true (1) if this task runner is for the specified CEF thread.
/// ///
int(CEF_CALLBACK* belongs_to_thread)(struct _cef_task_runner_t* self, int(CEF_CALLBACK* belongs_to_thread)(struct _cef_task_runner_t* self,
cef_thread_id_t threadId); cef_thread_id_t threadId);
/// ///
// Post a task for execution on the thread associated with this task runner. /// Post a task for execution on the thread associated with this task runner.
// Execution will occur asynchronously. /// Execution will occur asynchronously.
/// ///
int(CEF_CALLBACK* post_task)(struct _cef_task_runner_t* self, int(CEF_CALLBACK* post_task)(struct _cef_task_runner_t* self,
struct _cef_task_t* task); struct _cef_task_t* task);
/// ///
// Post a task for delayed execution on the thread associated with this task /// Post a task for delayed execution on the thread associated with this task
// runner. Execution will occur asynchronously. Delayed tasks are not /// runner. Execution will occur asynchronously. Delayed tasks are not
// supported on V8 WebWorker threads and will be executed without the /// supported on V8 WebWorker threads and will be executed without the
// specified delay. /// specified delay.
/// ///
int(CEF_CALLBACK* post_delayed_task)(struct _cef_task_runner_t* self, int(CEF_CALLBACK* post_delayed_task)(struct _cef_task_runner_t* self,
struct _cef_task_t* task, struct _cef_task_t* task,
@ -118,34 +118,34 @@ typedef struct _cef_task_runner_t {
} cef_task_runner_t; } cef_task_runner_t;
/// ///
// Returns the task runner for the current thread. Only CEF threads will have /// Returns the task runner for the current thread. Only CEF threads will have
// task runners. An NULL reference will be returned if this function is called /// task runners. An NULL reference will be returned if this function is called
// on an invalid thread. /// on an invalid thread.
/// ///
CEF_EXPORT cef_task_runner_t* cef_task_runner_get_for_current_thread(void); CEF_EXPORT cef_task_runner_t* cef_task_runner_get_for_current_thread(void);
/// ///
// Returns the task runner for the specified CEF thread. /// Returns the task runner for the specified CEF thread.
/// ///
CEF_EXPORT cef_task_runner_t* cef_task_runner_get_for_thread( CEF_EXPORT cef_task_runner_t* cef_task_runner_get_for_thread(
cef_thread_id_t threadId); cef_thread_id_t threadId);
/// ///
// Returns true (1) if called on the specified thread. Equivalent to using /// Returns true (1) if called on the specified thread. Equivalent to using
// cef_task_runner_t::GetForThread(threadId)->belongs_to_current_thread(). /// cef_task_runner_t::GetForThread(threadId)->belongs_to_current_thread().
/// ///
CEF_EXPORT int cef_currently_on(cef_thread_id_t threadId); CEF_EXPORT int cef_currently_on(cef_thread_id_t threadId);
/// ///
// Post a task for execution on the specified thread. Equivalent to using /// Post a task for execution on the specified thread. Equivalent to using
// cef_task_runner_t::GetForThread(threadId)->PostTask(task). /// cef_task_runner_t::GetForThread(threadId)->PostTask(task).
/// ///
CEF_EXPORT int cef_post_task(cef_thread_id_t threadId, cef_task_t* task); CEF_EXPORT int cef_post_task(cef_thread_id_t threadId, cef_task_t* task);
/// ///
// Post a task for delayed execution on the specified thread. Equivalent to /// Post a task for delayed execution on the specified thread. Equivalent to
// using cef_task_runner_t::GetForThread(threadId)->PostDelayedTask(task, /// using cef_task_runner_t::GetForThread(threadId)->PostDelayedTask(task,
// delay_ms). /// delay_ms).
/// ///
CEF_EXPORT int cef_post_delayed_task(cef_thread_id_t threadId, CEF_EXPORT int cef_post_delayed_task(cef_thread_id_t threadId,
cef_task_t* task, cef_task_t* task,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=d99ffc2270c1cf8b0f06dd08c1b6e9b27cee4bc8$ // $hash=b5b17f2a66283495e19978a5bbc36b47d9b61507$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_THREAD_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_THREAD_CAPI_H_
@ -48,60 +48,60 @@ extern "C" {
#endif #endif
/// ///
// A simple thread abstraction that establishes a message loop on a new thread. /// A simple thread abstraction that establishes a message loop on a new thread.
// The consumer uses cef_task_runner_t to execute code on the thread's message /// The consumer uses cef_task_runner_t to execute code on the thread's message
// loop. The thread is terminated when the cef_thread_t object is destroyed or /// loop. The thread is terminated when the cef_thread_t object is destroyed or
// stop() is called. All pending tasks queued on the thread's message loop will /// stop() is called. All pending tasks queued on the thread's message loop will
// run to completion before the thread is terminated. cef_thread_create() can be /// run to completion before the thread is terminated. cef_thread_create() can
// called on any valid CEF thread in either the browser or render process. This /// be called on any valid CEF thread in either the browser or render process.
// structure should only be used for tasks that require a dedicated thread. In /// This structure should only be used for tasks that require a dedicated
// most cases you can post tasks to an existing CEF thread instead of creating a /// thread. In most cases you can post tasks to an existing CEF thread instead
// new one; see cef_task.h for details. /// of creating a new one; see cef_task.h for details.
/// ///
typedef struct _cef_thread_t { typedef struct _cef_thread_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns the cef_task_runner_t that will execute code on this thread's /// Returns the cef_task_runner_t that will execute code on this thread's
// message loop. This function is safe to call from any thread. /// message loop. This function is safe to call from any thread.
/// ///
struct _cef_task_runner_t*(CEF_CALLBACK* get_task_runner)( struct _cef_task_runner_t*(CEF_CALLBACK* get_task_runner)(
struct _cef_thread_t* self); struct _cef_thread_t* self);
/// ///
// Returns the platform thread ID. It will return the same value after stop() /// Returns the platform thread ID. It will return the same value after stop()
// is called. This function is safe to call from any thread. /// is called. This function is safe to call from any thread.
/// ///
cef_platform_thread_id_t(CEF_CALLBACK* get_platform_thread_id)( cef_platform_thread_id_t(CEF_CALLBACK* get_platform_thread_id)(
struct _cef_thread_t* self); struct _cef_thread_t* self);
/// ///
// Stop and join the thread. This function must be called from the same thread /// Stop and join the thread. This function must be called from the same
// that called cef_thread_create(). Do not call this function if /// thread that called cef_thread_create(). Do not call this function if
// cef_thread_create() was called with a |stoppable| value of false (0). /// cef_thread_create() was called with a |stoppable| value of false (0).
/// ///
void(CEF_CALLBACK* stop)(struct _cef_thread_t* self); void(CEF_CALLBACK* stop)(struct _cef_thread_t* self);
/// ///
// Returns true (1) if the thread is currently running. This function must be /// Returns true (1) if the thread is currently running. This function must be
// called from the same thread that called cef_thread_create(). /// called from the same thread that called cef_thread_create().
/// ///
int(CEF_CALLBACK* is_running)(struct _cef_thread_t* self); int(CEF_CALLBACK* is_running)(struct _cef_thread_t* self);
} cef_thread_t; } cef_thread_t;
/// ///
// Create and start a new thread. This function does not block waiting for the /// Create and start a new thread. This function does not block waiting for the
// thread to run initialization. |display_name| is the name that will be used to /// thread to run initialization. |display_name| is the name that will be used
// identify the thread. |priority| is the thread execution priority. /// to identify the thread. |priority| is the thread execution priority.
// |message_loop_type| indicates the set of asynchronous events that the thread /// |message_loop_type| indicates the set of asynchronous events that the thread
// can process. If |stoppable| is true (1) the thread will stopped and joined on /// can process. If |stoppable| is true (1) the thread will stopped and joined
// destruction or when stop() is called; otherwise, the thread cannot be stopped /// on destruction or when stop() is called; otherwise, the thread cannot be
// and will be leaked on shutdown. On Windows the |com_init_mode| value /// stopped and will be leaked on shutdown. On Windows the |com_init_mode| value
// specifies how COM will be initialized for the thread. If |com_init_mode| is /// specifies how COM will be initialized for the thread. If |com_init_mode| is
// set to COM_INIT_MODE_STA then |message_loop_type| must be set to ML_TYPE_UI. /// set to COM_INIT_MODE_STA then |message_loop_type| must be set to ML_TYPE_UI.
/// ///
CEF_EXPORT cef_thread_t* cef_thread_create( CEF_EXPORT cef_thread_t* cef_thread_create(
const cef_string_t* display_name, const cef_string_t* display_name,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=0a206b1c12637c8b04b2815cb3b50f212768ba01$ // $hash=587514b02797f420da6ba13ba21c4344f41b56ce$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_TRACE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_TRACE_CAPI_H_
@ -48,20 +48,20 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to receive notification when tracing has completed. /// Implement this structure to receive notification when tracing has completed.
// The functions of this structure will be called on the browser process UI /// The functions of this structure will be called on the browser process UI
// thread. /// thread.
/// ///
typedef struct _cef_end_tracing_callback_t { typedef struct _cef_end_tracing_callback_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called after all processes have sent their trace data. |tracing_file| is /// Called after all processes have sent their trace data. |tracing_file| is
// the path at which tracing data was written. The client is responsible for /// the path at which tracing data was written. The client is responsible for
// deleting |tracing_file|. /// deleting |tracing_file|.
/// ///
void(CEF_CALLBACK* on_end_tracing_complete)( void(CEF_CALLBACK* on_end_tracing_complete)(
struct _cef_end_tracing_callback_t* self, struct _cef_end_tracing_callback_t* self,
@ -69,45 +69,45 @@ typedef struct _cef_end_tracing_callback_t {
} cef_end_tracing_callback_t; } cef_end_tracing_callback_t;
/// ///
// Start tracing events on all processes. Tracing is initialized asynchronously /// Start tracing events on all processes. Tracing is initialized asynchronously
// and |callback| will be executed on the UI thread after initialization is /// and |callback| will be executed on the UI thread after initialization is
// complete. /// complete.
// ///
// If CefBeginTracing was called previously, or if a CefEndTracingAsync call is /// If CefBeginTracing was called previously, or if a CefEndTracingAsync call is
// pending, CefBeginTracing will fail and return false (0). /// pending, CefBeginTracing will fail and return false (0).
// ///
// |categories| is a comma-delimited list of category wildcards. A category can /// |categories| is a comma-delimited list of category wildcards. A category can
// have an optional '-' prefix to make it an excluded category. Having both /// have an optional '-' prefix to make it an excluded category. Having both
// included and excluded categories in the same list is not supported. /// included and excluded categories in the same list is not supported.
// ///
// Example: "test_MyTest*" Example: "test_MyTest*,test_OtherStuff" Example: /// Examples: - "test_MyTest*" - "test_MyTest*,test_OtherStuff" -
// "-excluded_category1,-excluded_category2" /// "-excluded_category1,-excluded_category2"
// ///
// This function must be called on the browser process UI thread. /// This function must be called on the browser process UI thread.
/// ///
CEF_EXPORT int cef_begin_tracing(const cef_string_t* categories, CEF_EXPORT int cef_begin_tracing(const cef_string_t* categories,
struct _cef_completion_callback_t* callback); struct _cef_completion_callback_t* callback);
/// ///
// Stop tracing events on all processes. /// Stop tracing events on all processes.
// ///
// This function will fail and return false (0) if a previous call to /// This function will fail and return false (0) if a previous call to
// CefEndTracingAsync is already pending or if CefBeginTracing was not called. /// CefEndTracingAsync is already pending or if CefBeginTracing was not called.
// ///
// |tracing_file| is the path at which tracing data will be written and /// |tracing_file| is the path at which tracing data will be written and
// |callback| is the callback that will be executed once all processes have sent /// |callback| is the callback that will be executed once all processes have
// their trace data. If |tracing_file| is NULL a new temporary file path will be /// sent their trace data. If |tracing_file| is NULL a new temporary file path
// used. If |callback| is NULL no trace data will be written. /// will be used. If |callback| is NULL no trace data will be written.
// ///
// This function must be called on the browser process UI thread. /// This function must be called on the browser process UI thread.
/// ///
CEF_EXPORT int cef_end_tracing(const cef_string_t* tracing_file, CEF_EXPORT int cef_end_tracing(const cef_string_t* tracing_file,
cef_end_tracing_callback_t* callback); cef_end_tracing_callback_t* callback);
/// ///
// Returns the current system trace time or, if none is defined, the current /// Returns the current system trace time or, if none is defined, the current
// high-res time. Can be used by clients to synchronize with the time /// high-res time. Can be used by clients to synchronize with the time
// information in trace events. /// information in trace events.
/// ///
CEF_EXPORT int64 cef_now_from_system_trace_time(void); CEF_EXPORT int64 cef_now_from_system_trace_time(void);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=a14d77cd7756797afb4db3d28a2359da53011bfa$ // $hash=5b2bfaf4b7572935b2cfba804dc1625261e32e24$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_URLREQUEST_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_URLREQUEST_CAPI_H_
@ -53,77 +53,78 @@ extern "C" {
struct _cef_urlrequest_client_t; struct _cef_urlrequest_client_t;
/// ///
// Structure used to make a URL request. URL requests are not associated with a /// Structure used to make a URL request. URL requests are not associated with a
// browser instance so no cef_client_t callbacks will be executed. URL requests /// browser instance so no cef_client_t callbacks will be executed. URL requests
// can be created on any valid CEF thread in either the browser or render /// can be created on any valid CEF thread in either the browser or render
// process. Once created the functions of the URL request object must be /// process. Once created the functions of the URL request object must be
// accessed on the same thread that created it. /// accessed on the same thread that created it.
/// ///
typedef struct _cef_urlrequest_t { typedef struct _cef_urlrequest_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns the request object used to create this URL request. The returned /// Returns the request object used to create this URL request. The returned
// object is read-only and should not be modified. /// object is read-only and should not be modified.
/// ///
struct _cef_request_t*(CEF_CALLBACK* get_request)( struct _cef_request_t*(CEF_CALLBACK* get_request)(
struct _cef_urlrequest_t* self); struct _cef_urlrequest_t* self);
/// ///
// Returns the client. /// Returns the client.
/// ///
struct _cef_urlrequest_client_t*(CEF_CALLBACK* get_client)( struct _cef_urlrequest_client_t*(CEF_CALLBACK* get_client)(
struct _cef_urlrequest_t* self); struct _cef_urlrequest_t* self);
/// ///
// Returns the request status. /// Returns the request status.
/// ///
cef_urlrequest_status_t(CEF_CALLBACK* get_request_status)( cef_urlrequest_status_t(CEF_CALLBACK* get_request_status)(
struct _cef_urlrequest_t* self); struct _cef_urlrequest_t* self);
/// ///
// Returns the request error if status is UR_CANCELED or UR_FAILED, or 0 /// Returns the request error if status is UR_CANCELED or UR_FAILED, or 0
// otherwise. /// otherwise.
/// ///
cef_errorcode_t(CEF_CALLBACK* get_request_error)( cef_errorcode_t(CEF_CALLBACK* get_request_error)(
struct _cef_urlrequest_t* self); struct _cef_urlrequest_t* self);
/// ///
// Returns the response, or NULL if no response information is available. /// Returns the response, or NULL if no response information is available.
// Response information will only be available after the upload has completed. /// Response information will only be available after the upload has
// The returned object is read-only and should not be modified. /// completed. The returned object is read-only and should not be modified.
/// ///
struct _cef_response_t*(CEF_CALLBACK* get_response)( struct _cef_response_t*(CEF_CALLBACK* get_response)(
struct _cef_urlrequest_t* self); struct _cef_urlrequest_t* self);
/// ///
// Returns true (1) if the response body was served from the cache. This /// Returns true (1) if the response body was served from the cache. This
// includes responses for which revalidation was required. /// includes responses for which revalidation was required.
/// ///
int(CEF_CALLBACK* response_was_cached)(struct _cef_urlrequest_t* self); int(CEF_CALLBACK* response_was_cached)(struct _cef_urlrequest_t* self);
/// ///
// Cancel the request. /// Cancel the request.
/// ///
void(CEF_CALLBACK* cancel)(struct _cef_urlrequest_t* self); void(CEF_CALLBACK* cancel)(struct _cef_urlrequest_t* self);
} cef_urlrequest_t; } cef_urlrequest_t;
/// ///
// Create a new URL request that is not associated with a specific browser or /// Create a new URL request that is not associated with a specific browser or
// frame. Use cef_frame_t::CreateURLRequest instead if you want the request to /// frame. Use cef_frame_t::CreateURLRequest instead if you want the request to
// have this association, in which case it may be handled differently (see /// have this association, in which case it may be handled differently (see
// documentation on that function). A request created with this function may /// documentation on that function). A request created with this function may
// only originate from the browser process, and will behave as follows: /// only originate from the browser process, and will behave as follows:
// - It may be intercepted by the client via CefResourceRequestHandler or /// - It may be intercepted by the client via CefResourceRequestHandler or
// CefSchemeHandlerFactory. /// CefSchemeHandlerFactory.
// - POST data may only contain only a single element of type PDE_TYPE_FILE /// - POST data may only contain only a single element of type PDE_TYPE_FILE
// or PDE_TYPE_BYTES. /// or PDE_TYPE_BYTES.
// - If |request_context| is empty the global request context will be used. /// - If |request_context| is empty the global request context will be used.
// ///
// The |request| object will be marked as read-only after calling this function. /// The |request| object will be marked as read-only after calling this
/// function.
/// ///
CEF_EXPORT cef_urlrequest_t* cef_urlrequest_create( CEF_EXPORT cef_urlrequest_t* cef_urlrequest_create(
struct _cef_request_t* request, struct _cef_request_t* request,
@ -131,29 +132,29 @@ CEF_EXPORT cef_urlrequest_t* cef_urlrequest_create(
struct _cef_request_context_t* request_context); struct _cef_request_context_t* request_context);
/// ///
// Structure that should be implemented by the cef_urlrequest_t client. The /// Structure that should be implemented by the cef_urlrequest_t client. The
// functions of this structure will be called on the same thread that created /// functions of this structure will be called on the same thread that created
// the request unless otherwise documented. /// the request unless otherwise documented.
/// ///
typedef struct _cef_urlrequest_client_t { typedef struct _cef_urlrequest_client_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Notifies the client that the request has completed. Use the /// Notifies the client that the request has completed. Use the
// cef_urlrequest_t::GetRequestStatus function to determine if the request was /// cef_urlrequest_t::GetRequestStatus function to determine if the request
// successful or not. /// was successful or not.
/// ///
void(CEF_CALLBACK* on_request_complete)(struct _cef_urlrequest_client_t* self, void(CEF_CALLBACK* on_request_complete)(struct _cef_urlrequest_client_t* self,
struct _cef_urlrequest_t* request); struct _cef_urlrequest_t* request);
/// ///
// Notifies the client of upload progress. |current| denotes the number of /// Notifies the client of upload progress. |current| denotes the number of
// bytes sent so far and |total| is the total size of uploading data (or -1 if /// bytes sent so far and |total| is the total size of uploading data (or -1
// chunked upload is enabled). This function will only be called if the /// if chunked upload is enabled). This function will only be called if the
// UR_FLAG_REPORT_UPLOAD_PROGRESS flag is set on the request. /// UR_FLAG_REPORT_UPLOAD_PROGRESS flag is set on the request.
/// ///
void(CEF_CALLBACK* on_upload_progress)(struct _cef_urlrequest_client_t* self, void(CEF_CALLBACK* on_upload_progress)(struct _cef_urlrequest_client_t* self,
struct _cef_urlrequest_t* request, struct _cef_urlrequest_t* request,
@ -161,9 +162,9 @@ typedef struct _cef_urlrequest_client_t {
int64 total); int64 total);
/// ///
// Notifies the client of download progress. |current| denotes the number of /// Notifies the client of download progress. |current| denotes the number of
// bytes received up to the call and |total| is the expected total size of the /// bytes received up to the call and |total| is the expected total size of
// response (or -1 if not determined). /// the response (or -1 if not determined).
/// ///
void(CEF_CALLBACK* on_download_progress)( void(CEF_CALLBACK* on_download_progress)(
struct _cef_urlrequest_client_t* self, struct _cef_urlrequest_client_t* self,
@ -172,9 +173,9 @@ typedef struct _cef_urlrequest_client_t {
int64 total); int64 total);
/// ///
// Called when some part of the response is read. |data| contains the current /// Called when some part of the response is read. |data| contains the current
// bytes received since the last call. This function will not be called if the /// bytes received since the last call. This function will not be called if
// UR_FLAG_NO_DOWNLOAD_DATA flag is set on the request. /// the UR_FLAG_NO_DOWNLOAD_DATA flag is set on the request.
/// ///
void(CEF_CALLBACK* on_download_data)(struct _cef_urlrequest_client_t* self, void(CEF_CALLBACK* on_download_data)(struct _cef_urlrequest_client_t* self,
struct _cef_urlrequest_t* request, struct _cef_urlrequest_t* request,
@ -182,15 +183,16 @@ typedef struct _cef_urlrequest_client_t {
size_t data_length); size_t data_length);
/// ///
// Called on the IO thread when the browser needs credentials from the user. /// Called on the IO thread when the browser needs credentials from the user.
// |isProxy| indicates whether the host is a proxy server. |host| contains the /// |isProxy| indicates whether the host is a proxy server. |host| contains
// hostname and |port| contains the port number. Return true (1) to continue /// the hostname and |port| contains the port number. Return true (1) to
// the request and call cef_auth_callback_t::cont() when the authentication /// continue the request and call cef_auth_callback_t::cont() when the
// information is available. If the request has an associated browser/frame /// authentication information is available. If the request has an associated
// then returning false (0) will result in a call to GetAuthCredentials on the /// browser/frame then returning false (0) will result in a call to
// cef_request_handler_t associated with that browser, if any. Otherwise, /// GetAuthCredentials on the cef_request_handler_t associated with that
// returning false (0) will cancel the request immediately. This function will /// browser, if any. Otherwise, returning false (0) will cancel the request
// only be called for requests initiated from the browser process. /// immediately. This function will only be called for requests initiated from
/// the browser process.
/// ///
int(CEF_CALLBACK* get_auth_credentials)( int(CEF_CALLBACK* get_auth_credentials)(
struct _cef_urlrequest_client_t* self, struct _cef_urlrequest_client_t* self,

File diff suppressed because it is too large Load Diff

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=ee899158c4f61cc3f85176174d6fd9cbe2a3db4c$ // $hash=e8f16d32cc835f9b20b3fcd7048146f52ec9bfe5$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_VALUES_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_VALUES_CAPI_H_
@ -51,226 +51,228 @@ struct _cef_dictionary_value_t;
struct _cef_list_value_t; struct _cef_list_value_t;
/// ///
// Structure that wraps other data value types. Complex types (binary, /// Structure that wraps other data value types. Complex types (binary,
// dictionary and list) will be referenced but not owned by this object. Can be /// dictionary and list) will be referenced but not owned by this object. Can be
// used on any process and thread. /// used on any process and thread.
/// ///
typedef struct _cef_value_t { typedef struct _cef_value_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if the underlying data is valid. This will always be true /// Returns true (1) if the underlying data is valid. This will always be true
// (1) for simple types. For complex types (binary, dictionary and list) the /// (1) for simple types. For complex types (binary, dictionary and list) the
// underlying data may become invalid if owned by another object (e.g. list or /// underlying data may become invalid if owned by another object (e.g. list
// dictionary) and that other object is then modified or destroyed. This value /// or dictionary) and that other object is then modified or destroyed. This
// object can be re-used by calling Set*() even if the underlying data is /// value object can be re-used by calling Set*() even if the underlying data
// invalid. /// is invalid.
/// ///
int(CEF_CALLBACK* is_valid)(struct _cef_value_t* self); int(CEF_CALLBACK* is_valid)(struct _cef_value_t* self);
/// ///
// Returns true (1) if the underlying data is owned by another object. /// Returns true (1) if the underlying data is owned by another object.
/// ///
int(CEF_CALLBACK* is_owned)(struct _cef_value_t* self); int(CEF_CALLBACK* is_owned)(struct _cef_value_t* self);
/// ///
// Returns true (1) if the underlying data is read-only. Some APIs may expose /// Returns true (1) if the underlying data is read-only. Some APIs may expose
// read-only objects. /// read-only objects.
/// ///
int(CEF_CALLBACK* is_read_only)(struct _cef_value_t* self); int(CEF_CALLBACK* is_read_only)(struct _cef_value_t* self);
/// ///
// Returns true (1) if this object and |that| object have the same underlying /// Returns true (1) if this object and |that| object have the same underlying
// data. If true (1) modifications to this object will also affect |that| /// data. If true (1) modifications to this object will also affect |that|
// object and vice-versa. /// object and vice-versa.
/// ///
int(CEF_CALLBACK* is_same)(struct _cef_value_t* self, int(CEF_CALLBACK* is_same)(struct _cef_value_t* self,
struct _cef_value_t* that); struct _cef_value_t* that);
/// ///
// Returns true (1) if this object and |that| object have an equivalent /// Returns true (1) if this object and |that| object have an equivalent
// underlying value but are not necessarily the same object. /// underlying value but are not necessarily the same object.
/// ///
int(CEF_CALLBACK* is_equal)(struct _cef_value_t* self, int(CEF_CALLBACK* is_equal)(struct _cef_value_t* self,
struct _cef_value_t* that); struct _cef_value_t* that);
/// ///
// Returns a copy of this object. The underlying data will also be copied. /// Returns a copy of this object. The underlying data will also be copied.
/// ///
struct _cef_value_t*(CEF_CALLBACK* copy)(struct _cef_value_t* self); struct _cef_value_t*(CEF_CALLBACK* copy)(struct _cef_value_t* self);
/// ///
// Returns the underlying value type. /// Returns the underlying value type.
/// ///
cef_value_type_t(CEF_CALLBACK* get_type)(struct _cef_value_t* self); cef_value_type_t(CEF_CALLBACK* get_type)(struct _cef_value_t* self);
/// ///
// Returns the underlying value as type bool. /// Returns the underlying value as type bool.
/// ///
int(CEF_CALLBACK* get_bool)(struct _cef_value_t* self); int(CEF_CALLBACK* get_bool)(struct _cef_value_t* self);
/// ///
// Returns the underlying value as type int. /// Returns the underlying value as type int.
/// ///
int(CEF_CALLBACK* get_int)(struct _cef_value_t* self); int(CEF_CALLBACK* get_int)(struct _cef_value_t* self);
/// ///
// Returns the underlying value as type double. /// Returns the underlying value as type double.
/// ///
double(CEF_CALLBACK* get_double)(struct _cef_value_t* self); double(CEF_CALLBACK* get_double)(struct _cef_value_t* self);
/// ///
// Returns the underlying value as type string. /// Returns the underlying value as type string.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_string)(struct _cef_value_t* self); cef_string_userfree_t(CEF_CALLBACK* get_string)(struct _cef_value_t* self);
/// ///
// Returns the underlying value as type binary. The returned reference may /// Returns the underlying value as type binary. The returned reference may
// become invalid if the value is owned by another object or if ownership is /// become invalid if the value is owned by another object or if ownership is
// transferred to another object in the future. To maintain a reference to the /// transferred to another object in the future. To maintain a reference to
// value after assigning ownership to a dictionary or list pass this object to /// the value after assigning ownership to a dictionary or list pass this
// the set_value() function instead of passing the returned reference to /// object to the set_value() function instead of passing the returned
// set_binary(). /// reference to set_binary().
/// ///
struct _cef_binary_value_t*(CEF_CALLBACK* get_binary)( struct _cef_binary_value_t*(CEF_CALLBACK* get_binary)(
struct _cef_value_t* self); struct _cef_value_t* self);
/// ///
// Returns the underlying value as type dictionary. The returned reference may /// Returns the underlying value as type dictionary. The returned reference
// become invalid if the value is owned by another object or if ownership is /// may become invalid if the value is owned by another object or if ownership
// transferred to another object in the future. To maintain a reference to the /// is transferred to another object in the future. To maintain a reference to
// value after assigning ownership to a dictionary or list pass this object to /// the value after assigning ownership to a dictionary or list pass this
// the set_value() function instead of passing the returned reference to /// object to the set_value() function instead of passing the returned
// set_dictionary(). /// reference to set_dictionary().
/// ///
struct _cef_dictionary_value_t*(CEF_CALLBACK* get_dictionary)( struct _cef_dictionary_value_t*(CEF_CALLBACK* get_dictionary)(
struct _cef_value_t* self); struct _cef_value_t* self);
/// ///
// Returns the underlying value as type list. The returned reference may /// Returns the underlying value as type list. The returned reference may
// become invalid if the value is owned by another object or if ownership is /// become invalid if the value is owned by another object or if ownership is
// transferred to another object in the future. To maintain a reference to the /// transferred to another object in the future. To maintain a reference to
// value after assigning ownership to a dictionary or list pass this object to /// the value after assigning ownership to a dictionary or list pass this
// the set_value() function instead of passing the returned reference to /// object to the set_value() function instead of passing the returned
// set_list(). /// reference to set_list().
/// ///
struct _cef_list_value_t*(CEF_CALLBACK* get_list)(struct _cef_value_t* self); struct _cef_list_value_t*(CEF_CALLBACK* get_list)(struct _cef_value_t* self);
/// ///
// Sets the underlying value as type null. Returns true (1) if the value was /// Sets the underlying value as type null. Returns true (1) if the value was
// set successfully. /// set successfully.
/// ///
int(CEF_CALLBACK* set_null)(struct _cef_value_t* self); int(CEF_CALLBACK* set_null)(struct _cef_value_t* self);
/// ///
// Sets the underlying value as type bool. Returns true (1) if the value was /// Sets the underlying value as type bool. Returns true (1) if the value was
// set successfully. /// set successfully.
/// ///
int(CEF_CALLBACK* set_bool)(struct _cef_value_t* self, int value); int(CEF_CALLBACK* set_bool)(struct _cef_value_t* self, int value);
/// ///
// Sets the underlying value as type int. Returns true (1) if the value was /// Sets the underlying value as type int. Returns true (1) if the value was
// set successfully. /// set successfully.
/// ///
int(CEF_CALLBACK* set_int)(struct _cef_value_t* self, int value); int(CEF_CALLBACK* set_int)(struct _cef_value_t* self, int value);
/// ///
// Sets the underlying value as type double. Returns true (1) if the value was /// Sets the underlying value as type double. Returns true (1) if the value
// set successfully. /// was set successfully.
/// ///
int(CEF_CALLBACK* set_double)(struct _cef_value_t* self, double value); int(CEF_CALLBACK* set_double)(struct _cef_value_t* self, double value);
/// ///
// Sets the underlying value as type string. Returns true (1) if the value was /// Sets the underlying value as type string. Returns true (1) if the value
// set successfully. /// was set successfully.
/// ///
int(CEF_CALLBACK* set_string)(struct _cef_value_t* self, int(CEF_CALLBACK* set_string)(struct _cef_value_t* self,
const cef_string_t* value); const cef_string_t* value);
/// ///
// Sets the underlying value as type binary. Returns true (1) if the value was /// Sets the underlying value as type binary. Returns true (1) if the value
// set successfully. This object keeps a reference to |value| and ownership of /// was set successfully. This object keeps a reference to |value| and
// the underlying data remains unchanged. /// ownership of the underlying data remains unchanged.
/// ///
int(CEF_CALLBACK* set_binary)(struct _cef_value_t* self, int(CEF_CALLBACK* set_binary)(struct _cef_value_t* self,
struct _cef_binary_value_t* value); struct _cef_binary_value_t* value);
/// ///
// Sets the underlying value as type dict. Returns true (1) if the value was /// Sets the underlying value as type dict. Returns true (1) if the value was
// set successfully. This object keeps a reference to |value| and ownership of /// set successfully. This object keeps a reference to |value| and ownership
// the underlying data remains unchanged. /// of the underlying data remains unchanged.
/// ///
int(CEF_CALLBACK* set_dictionary)(struct _cef_value_t* self, int(CEF_CALLBACK* set_dictionary)(struct _cef_value_t* self,
struct _cef_dictionary_value_t* value); struct _cef_dictionary_value_t* value);
/// ///
// Sets the underlying value as type list. Returns true (1) if the value was /// Sets the underlying value as type list. Returns true (1) if the value was
// set successfully. This object keeps a reference to |value| and ownership of /// set successfully. This object keeps a reference to |value| and ownership
// the underlying data remains unchanged. /// of the underlying data remains unchanged.
/// ///
int(CEF_CALLBACK* set_list)(struct _cef_value_t* self, int(CEF_CALLBACK* set_list)(struct _cef_value_t* self,
struct _cef_list_value_t* value); struct _cef_list_value_t* value);
} cef_value_t; } cef_value_t;
/// ///
// Creates a new object. /// Creates a new object.
/// ///
CEF_EXPORT cef_value_t* cef_value_create(void); CEF_EXPORT cef_value_t* cef_value_create(void);
/// ///
// Structure representing a binary value. Can be used on any process and thread. /// Structure representing a binary value. Can be used on any process and
/// thread.
/// ///
typedef struct _cef_binary_value_t { typedef struct _cef_binary_value_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is valid. This object may become invalid if /// Returns true (1) if this object is valid. This object may become invalid
// the underlying data is owned by another object (e.g. list or dictionary) /// if the underlying data is owned by another object (e.g. list or
// and that other object is then modified or destroyed. Do not call any other /// dictionary) and that other object is then modified or destroyed. Do not
// functions if this function returns false (0). /// call any other functions if this function returns false (0).
/// ///
int(CEF_CALLBACK* is_valid)(struct _cef_binary_value_t* self); int(CEF_CALLBACK* is_valid)(struct _cef_binary_value_t* self);
/// ///
// Returns true (1) if this object is currently owned by another object. /// Returns true (1) if this object is currently owned by another object.
/// ///
int(CEF_CALLBACK* is_owned)(struct _cef_binary_value_t* self); int(CEF_CALLBACK* is_owned)(struct _cef_binary_value_t* self);
/// ///
// Returns true (1) if this object and |that| object have the same underlying /// Returns true (1) if this object and |that| object have the same underlying
// data. /// data.
/// ///
int(CEF_CALLBACK* is_same)(struct _cef_binary_value_t* self, int(CEF_CALLBACK* is_same)(struct _cef_binary_value_t* self,
struct _cef_binary_value_t* that); struct _cef_binary_value_t* that);
/// ///
// Returns true (1) if this object and |that| object have an equivalent /// Returns true (1) if this object and |that| object have an equivalent
// underlying value but are not necessarily the same object. /// underlying value but are not necessarily the same object.
/// ///
int(CEF_CALLBACK* is_equal)(struct _cef_binary_value_t* self, int(CEF_CALLBACK* is_equal)(struct _cef_binary_value_t* self,
struct _cef_binary_value_t* that); struct _cef_binary_value_t* that);
/// ///
// Returns a copy of this object. The data in this object will also be copied. /// Returns a copy of this object. The data in this object will also be
/// copied.
/// ///
struct _cef_binary_value_t*(CEF_CALLBACK* copy)( struct _cef_binary_value_t*(CEF_CALLBACK* copy)(
struct _cef_binary_value_t* self); struct _cef_binary_value_t* self);
/// ///
// Returns the data size. /// Returns the data size.
/// ///
size_t(CEF_CALLBACK* get_size)(struct _cef_binary_value_t* self); size_t(CEF_CALLBACK* get_size)(struct _cef_binary_value_t* self);
/// ///
// Read up to |buffer_size| number of bytes into |buffer|. Reading begins at /// Read up to |buffer_size| number of bytes into |buffer|. Reading begins at
// the specified byte |data_offset|. Returns the number of bytes read. /// the specified byte |data_offset|. Returns the number of bytes read.
/// ///
size_t(CEF_CALLBACK* get_data)(struct _cef_binary_value_t* self, size_t(CEF_CALLBACK* get_data)(struct _cef_binary_value_t* self,
void* buffer, void* buffer,
@ -279,130 +281,130 @@ typedef struct _cef_binary_value_t {
} cef_binary_value_t; } cef_binary_value_t;
/// ///
// Creates a new object that is not owned by any other object. The specified /// Creates a new object that is not owned by any other object. The specified
// |data| will be copied. /// |data| will be copied.
/// ///
CEF_EXPORT cef_binary_value_t* cef_binary_value_create(const void* data, CEF_EXPORT cef_binary_value_t* cef_binary_value_create(const void* data,
size_t data_size); size_t data_size);
/// ///
// Structure representing a dictionary value. Can be used on any process and /// Structure representing a dictionary value. Can be used on any process and
// thread. /// thread.
/// ///
typedef struct _cef_dictionary_value_t { typedef struct _cef_dictionary_value_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is valid. This object may become invalid if /// Returns true (1) if this object is valid. This object may become invalid
// the underlying data is owned by another object (e.g. list or dictionary) /// if the underlying data is owned by another object (e.g. list or
// and that other object is then modified or destroyed. Do not call any other /// dictionary) and that other object is then modified or destroyed. Do not
// functions if this function returns false (0). /// call any other functions if this function returns false (0).
/// ///
int(CEF_CALLBACK* is_valid)(struct _cef_dictionary_value_t* self); int(CEF_CALLBACK* is_valid)(struct _cef_dictionary_value_t* self);
/// ///
// Returns true (1) if this object is currently owned by another object. /// Returns true (1) if this object is currently owned by another object.
/// ///
int(CEF_CALLBACK* is_owned)(struct _cef_dictionary_value_t* self); int(CEF_CALLBACK* is_owned)(struct _cef_dictionary_value_t* self);
/// ///
// Returns true (1) if the values of this object are read-only. Some APIs may /// Returns true (1) if the values of this object are read-only. Some APIs may
// expose read-only objects. /// expose read-only objects.
/// ///
int(CEF_CALLBACK* is_read_only)(struct _cef_dictionary_value_t* self); int(CEF_CALLBACK* is_read_only)(struct _cef_dictionary_value_t* self);
/// ///
// Returns true (1) if this object and |that| object have the same underlying /// Returns true (1) if this object and |that| object have the same underlying
// data. If true (1) modifications to this object will also affect |that| /// data. If true (1) modifications to this object will also affect |that|
// object and vice-versa. /// object and vice-versa.
/// ///
int(CEF_CALLBACK* is_same)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* is_same)(struct _cef_dictionary_value_t* self,
struct _cef_dictionary_value_t* that); struct _cef_dictionary_value_t* that);
/// ///
// Returns true (1) if this object and |that| object have an equivalent /// Returns true (1) if this object and |that| object have an equivalent
// underlying value but are not necessarily the same object. /// underlying value but are not necessarily the same object.
/// ///
int(CEF_CALLBACK* is_equal)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* is_equal)(struct _cef_dictionary_value_t* self,
struct _cef_dictionary_value_t* that); struct _cef_dictionary_value_t* that);
/// ///
// Returns a writable copy of this object. If |exclude_NULL_children| is true /// Returns a writable copy of this object. If |exclude_NULL_children| is true
// (1) any NULL dictionaries or lists will be excluded from the copy. /// (1) any NULL dictionaries or lists will be excluded from the copy.
/// ///
struct _cef_dictionary_value_t*(CEF_CALLBACK* copy)( struct _cef_dictionary_value_t*(CEF_CALLBACK* copy)(
struct _cef_dictionary_value_t* self, struct _cef_dictionary_value_t* self,
int exclude_empty_children); int exclude_empty_children);
/// ///
// Returns the number of values. /// Returns the number of values.
/// ///
size_t(CEF_CALLBACK* get_size)(struct _cef_dictionary_value_t* self); size_t(CEF_CALLBACK* get_size)(struct _cef_dictionary_value_t* self);
/// ///
// Removes all values. Returns true (1) on success. /// Removes all values. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* clear)(struct _cef_dictionary_value_t* self); int(CEF_CALLBACK* clear)(struct _cef_dictionary_value_t* self);
/// ///
// Returns true (1) if the current dictionary has a value for the given key. /// Returns true (1) if the current dictionary has a value for the given key.
/// ///
int(CEF_CALLBACK* has_key)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* has_key)(struct _cef_dictionary_value_t* self,
const cef_string_t* key); const cef_string_t* key);
/// ///
// Reads all keys for this dictionary into the specified vector. /// Reads all keys for this dictionary into the specified vector.
/// ///
int(CEF_CALLBACK* get_keys)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* get_keys)(struct _cef_dictionary_value_t* self,
cef_string_list_t keys); cef_string_list_t keys);
/// ///
// Removes the value at the specified key. Returns true (1) is the value was /// Removes the value at the specified key. Returns true (1) is the value was
// removed successfully. /// removed successfully.
/// ///
int(CEF_CALLBACK* remove)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* remove)(struct _cef_dictionary_value_t* self,
const cef_string_t* key); const cef_string_t* key);
/// ///
// Returns the value type for the specified key. /// Returns the value type for the specified key.
/// ///
cef_value_type_t(CEF_CALLBACK* get_type)(struct _cef_dictionary_value_t* self, cef_value_type_t(CEF_CALLBACK* get_type)(struct _cef_dictionary_value_t* self,
const cef_string_t* key); const cef_string_t* key);
/// ///
// Returns the value at the specified key. For simple types the returned value /// Returns the value at the specified key. For simple types the returned
// will copy existing data and modifications to the value will not modify this /// value will copy existing data and modifications to the value will not
// object. For complex types (binary, dictionary and list) the returned value /// modify this object. For complex types (binary, dictionary and list) the
// will reference existing data and modifications to the value will modify /// returned value will reference existing data and modifications to the value
// this object. /// will modify this object.
/// ///
struct _cef_value_t*(CEF_CALLBACK* get_value)( struct _cef_value_t*(CEF_CALLBACK* get_value)(
struct _cef_dictionary_value_t* self, struct _cef_dictionary_value_t* self,
const cef_string_t* key); const cef_string_t* key);
/// ///
// Returns the value at the specified key as type bool. /// Returns the value at the specified key as type bool.
/// ///
int(CEF_CALLBACK* get_bool)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* get_bool)(struct _cef_dictionary_value_t* self,
const cef_string_t* key); const cef_string_t* key);
/// ///
// Returns the value at the specified key as type int. /// Returns the value at the specified key as type int.
/// ///
int(CEF_CALLBACK* get_int)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* get_int)(struct _cef_dictionary_value_t* self,
const cef_string_t* key); const cef_string_t* key);
/// ///
// Returns the value at the specified key as type double. /// Returns the value at the specified key as type double.
/// ///
double(CEF_CALLBACK* get_double)(struct _cef_dictionary_value_t* self, double(CEF_CALLBACK* get_double)(struct _cef_dictionary_value_t* self,
const cef_string_t* key); const cef_string_t* key);
/// ///
// Returns the value at the specified key as type string. /// Returns the value at the specified key as type string.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_string)( cef_string_userfree_t(CEF_CALLBACK* get_string)(
@ -410,110 +412,110 @@ typedef struct _cef_dictionary_value_t {
const cef_string_t* key); const cef_string_t* key);
/// ///
// Returns the value at the specified key as type binary. The returned value /// Returns the value at the specified key as type binary. The returned value
// will reference existing data. /// will reference existing data.
/// ///
struct _cef_binary_value_t*(CEF_CALLBACK* get_binary)( struct _cef_binary_value_t*(CEF_CALLBACK* get_binary)(
struct _cef_dictionary_value_t* self, struct _cef_dictionary_value_t* self,
const cef_string_t* key); const cef_string_t* key);
/// ///
// Returns the value at the specified key as type dictionary. The returned /// Returns the value at the specified key as type dictionary. The returned
// value will reference existing data and modifications to the value will /// value will reference existing data and modifications to the value will
// modify this object. /// modify this object.
/// ///
struct _cef_dictionary_value_t*(CEF_CALLBACK* get_dictionary)( struct _cef_dictionary_value_t*(CEF_CALLBACK* get_dictionary)(
struct _cef_dictionary_value_t* self, struct _cef_dictionary_value_t* self,
const cef_string_t* key); const cef_string_t* key);
/// ///
// Returns the value at the specified key as type list. The returned value /// Returns the value at the specified key as type list. The returned value
// will reference existing data and modifications to the value will modify /// will reference existing data and modifications to the value will modify
// this object. /// this object.
/// ///
struct _cef_list_value_t*(CEF_CALLBACK* get_list)( struct _cef_list_value_t*(CEF_CALLBACK* get_list)(
struct _cef_dictionary_value_t* self, struct _cef_dictionary_value_t* self,
const cef_string_t* key); const cef_string_t* key);
/// ///
// Sets the value at the specified key. Returns true (1) if the value was set /// Sets the value at the specified key. Returns true (1) if the value was set
// successfully. If |value| represents simple data then the underlying data /// successfully. If |value| represents simple data then the underlying data
// will be copied and modifications to |value| will not modify this object. If /// will be copied and modifications to |value| will not modify this object.
// |value| represents complex data (binary, dictionary or list) then the /// If |value| represents complex data (binary, dictionary or list) then the
// underlying data will be referenced and modifications to |value| will modify /// underlying data will be referenced and modifications to |value| will
// this object. /// modify this object.
/// ///
int(CEF_CALLBACK* set_value)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* set_value)(struct _cef_dictionary_value_t* self,
const cef_string_t* key, const cef_string_t* key,
struct _cef_value_t* value); struct _cef_value_t* value);
/// ///
// Sets the value at the specified key as type null. Returns true (1) if the /// Sets the value at the specified key as type null. Returns true (1) if the
// value was set successfully. /// value was set successfully.
/// ///
int(CEF_CALLBACK* set_null)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* set_null)(struct _cef_dictionary_value_t* self,
const cef_string_t* key); const cef_string_t* key);
/// ///
// Sets the value at the specified key as type bool. Returns true (1) if the /// Sets the value at the specified key as type bool. Returns true (1) if the
// value was set successfully. /// value was set successfully.
/// ///
int(CEF_CALLBACK* set_bool)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* set_bool)(struct _cef_dictionary_value_t* self,
const cef_string_t* key, const cef_string_t* key,
int value); int value);
/// ///
// Sets the value at the specified key as type int. Returns true (1) if the /// Sets the value at the specified key as type int. Returns true (1) if the
// value was set successfully. /// value was set successfully.
/// ///
int(CEF_CALLBACK* set_int)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* set_int)(struct _cef_dictionary_value_t* self,
const cef_string_t* key, const cef_string_t* key,
int value); int value);
/// ///
// Sets the value at the specified key as type double. Returns true (1) if the /// Sets the value at the specified key as type double. Returns true (1) if
// value was set successfully. /// the value was set successfully.
/// ///
int(CEF_CALLBACK* set_double)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* set_double)(struct _cef_dictionary_value_t* self,
const cef_string_t* key, const cef_string_t* key,
double value); double value);
/// ///
// Sets the value at the specified key as type string. Returns true (1) if the /// Sets the value at the specified key as type string. Returns true (1) if
// value was set successfully. /// the value was set successfully.
/// ///
int(CEF_CALLBACK* set_string)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* set_string)(struct _cef_dictionary_value_t* self,
const cef_string_t* key, const cef_string_t* key,
const cef_string_t* value); const cef_string_t* value);
/// ///
// Sets the value at the specified key as type binary. Returns true (1) if the /// Sets the value at the specified key as type binary. Returns true (1) if
// value was set successfully. If |value| is currently owned by another object /// the value was set successfully. If |value| is currently owned by another
// then the value will be copied and the |value| reference will not change. /// object then the value will be copied and the |value| reference will not
// Otherwise, ownership will be transferred to this object and the |value| /// change. Otherwise, ownership will be transferred to this object and the
// reference will be invalidated. /// |value| reference will be invalidated.
/// ///
int(CEF_CALLBACK* set_binary)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* set_binary)(struct _cef_dictionary_value_t* self,
const cef_string_t* key, const cef_string_t* key,
struct _cef_binary_value_t* value); struct _cef_binary_value_t* value);
/// ///
// Sets the value at the specified key as type dict. Returns true (1) if the /// Sets the value at the specified key as type dict. Returns true (1) if the
// value was set successfully. If |value| is currently owned by another object /// value was set successfully. If |value| is currently owned by another
// then the value will be copied and the |value| reference will not change. /// object then the value will be copied and the |value| reference will not
// Otherwise, ownership will be transferred to this object and the |value| /// change. Otherwise, ownership will be transferred to this object and the
// reference will be invalidated. /// |value| reference will be invalidated.
/// ///
int(CEF_CALLBACK* set_dictionary)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* set_dictionary)(struct _cef_dictionary_value_t* self,
const cef_string_t* key, const cef_string_t* key,
struct _cef_dictionary_value_t* value); struct _cef_dictionary_value_t* value);
/// ///
// Sets the value at the specified key as type list. Returns true (1) if the /// Sets the value at the specified key as type list. Returns true (1) if the
// value was set successfully. If |value| is currently owned by another object /// value was set successfully. If |value| is currently owned by another
// then the value will be copied and the |value| reference will not change. /// object then the value will be copied and the |value| reference will not
// Otherwise, ownership will be transferred to this object and the |value| /// change. Otherwise, ownership will be transferred to this object and the
// reference will be invalidated. /// |value| reference will be invalidated.
/// ///
int(CEF_CALLBACK* set_list)(struct _cef_dictionary_value_t* self, int(CEF_CALLBACK* set_list)(struct _cef_dictionary_value_t* self,
const cef_string_t* key, const cef_string_t* key,
@ -521,220 +523,220 @@ typedef struct _cef_dictionary_value_t {
} cef_dictionary_value_t; } cef_dictionary_value_t;
/// ///
// Creates a new object that is not owned by any other object. /// Creates a new object that is not owned by any other object.
/// ///
CEF_EXPORT cef_dictionary_value_t* cef_dictionary_value_create(void); CEF_EXPORT cef_dictionary_value_t* cef_dictionary_value_create(void);
/// ///
// Structure representing a list value. Can be used on any process and thread. /// Structure representing a list value. Can be used on any process and thread.
/// ///
typedef struct _cef_list_value_t { typedef struct _cef_list_value_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is valid. This object may become invalid if /// Returns true (1) if this object is valid. This object may become invalid
// the underlying data is owned by another object (e.g. list or dictionary) /// if the underlying data is owned by another object (e.g. list or
// and that other object is then modified or destroyed. Do not call any other /// dictionary) and that other object is then modified or destroyed. Do not
// functions if this function returns false (0). /// call any other functions if this function returns false (0).
/// ///
int(CEF_CALLBACK* is_valid)(struct _cef_list_value_t* self); int(CEF_CALLBACK* is_valid)(struct _cef_list_value_t* self);
/// ///
// Returns true (1) if this object is currently owned by another object. /// Returns true (1) if this object is currently owned by another object.
/// ///
int(CEF_CALLBACK* is_owned)(struct _cef_list_value_t* self); int(CEF_CALLBACK* is_owned)(struct _cef_list_value_t* self);
/// ///
// Returns true (1) if the values of this object are read-only. Some APIs may /// Returns true (1) if the values of this object are read-only. Some APIs may
// expose read-only objects. /// expose read-only objects.
/// ///
int(CEF_CALLBACK* is_read_only)(struct _cef_list_value_t* self); int(CEF_CALLBACK* is_read_only)(struct _cef_list_value_t* self);
/// ///
// Returns true (1) if this object and |that| object have the same underlying /// Returns true (1) if this object and |that| object have the same underlying
// data. If true (1) modifications to this object will also affect |that| /// data. If true (1) modifications to this object will also affect |that|
// object and vice-versa. /// object and vice-versa.
/// ///
int(CEF_CALLBACK* is_same)(struct _cef_list_value_t* self, int(CEF_CALLBACK* is_same)(struct _cef_list_value_t* self,
struct _cef_list_value_t* that); struct _cef_list_value_t* that);
/// ///
// Returns true (1) if this object and |that| object have an equivalent /// Returns true (1) if this object and |that| object have an equivalent
// underlying value but are not necessarily the same object. /// underlying value but are not necessarily the same object.
/// ///
int(CEF_CALLBACK* is_equal)(struct _cef_list_value_t* self, int(CEF_CALLBACK* is_equal)(struct _cef_list_value_t* self,
struct _cef_list_value_t* that); struct _cef_list_value_t* that);
/// ///
// Returns a writable copy of this object. /// Returns a writable copy of this object.
/// ///
struct _cef_list_value_t*(CEF_CALLBACK* copy)(struct _cef_list_value_t* self); struct _cef_list_value_t*(CEF_CALLBACK* copy)(struct _cef_list_value_t* self);
/// ///
// Sets the number of values. If the number of values is expanded all new /// Sets the number of values. If the number of values is expanded all new
// value slots will default to type null. Returns true (1) on success. /// value slots will default to type null. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_size)(struct _cef_list_value_t* self, size_t size); int(CEF_CALLBACK* set_size)(struct _cef_list_value_t* self, size_t size);
/// ///
// Returns the number of values. /// Returns the number of values.
/// ///
size_t(CEF_CALLBACK* get_size)(struct _cef_list_value_t* self); size_t(CEF_CALLBACK* get_size)(struct _cef_list_value_t* self);
/// ///
// Removes all values. Returns true (1) on success. /// Removes all values. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* clear)(struct _cef_list_value_t* self); int(CEF_CALLBACK* clear)(struct _cef_list_value_t* self);
/// ///
// Removes the value at the specified index. /// Removes the value at the specified index.
/// ///
int(CEF_CALLBACK* remove)(struct _cef_list_value_t* self, size_t index); int(CEF_CALLBACK* remove)(struct _cef_list_value_t* self, size_t index);
/// ///
// Returns the value type at the specified index. /// Returns the value type at the specified index.
/// ///
cef_value_type_t(CEF_CALLBACK* get_type)(struct _cef_list_value_t* self, cef_value_type_t(CEF_CALLBACK* get_type)(struct _cef_list_value_t* self,
size_t index); size_t index);
/// ///
// Returns the value at the specified index. For simple types the returned /// Returns the value at the specified index. For simple types the returned
// value will copy existing data and modifications to the value will not /// value will copy existing data and modifications to the value will not
// modify this object. For complex types (binary, dictionary and list) the /// modify this object. For complex types (binary, dictionary and list) the
// returned value will reference existing data and modifications to the value /// returned value will reference existing data and modifications to the value
// will modify this object. /// will modify this object.
/// ///
struct _cef_value_t*(CEF_CALLBACK* get_value)(struct _cef_list_value_t* self, struct _cef_value_t*(CEF_CALLBACK* get_value)(struct _cef_list_value_t* self,
size_t index); size_t index);
/// ///
// Returns the value at the specified index as type bool. /// Returns the value at the specified index as type bool.
/// ///
int(CEF_CALLBACK* get_bool)(struct _cef_list_value_t* self, size_t index); int(CEF_CALLBACK* get_bool)(struct _cef_list_value_t* self, size_t index);
/// ///
// Returns the value at the specified index as type int. /// Returns the value at the specified index as type int.
/// ///
int(CEF_CALLBACK* get_int)(struct _cef_list_value_t* self, size_t index); int(CEF_CALLBACK* get_int)(struct _cef_list_value_t* self, size_t index);
/// ///
// Returns the value at the specified index as type double. /// Returns the value at the specified index as type double.
/// ///
double(CEF_CALLBACK* get_double)(struct _cef_list_value_t* self, double(CEF_CALLBACK* get_double)(struct _cef_list_value_t* self,
size_t index); size_t index);
/// ///
// Returns the value at the specified index as type string. /// Returns the value at the specified index as type string.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t( cef_string_userfree_t(
CEF_CALLBACK* get_string)(struct _cef_list_value_t* self, size_t index); CEF_CALLBACK* get_string)(struct _cef_list_value_t* self, size_t index);
/// ///
// Returns the value at the specified index as type binary. The returned value /// Returns the value at the specified index as type binary. The returned
// will reference existing data. /// value will reference existing data.
/// ///
struct _cef_binary_value_t*( struct _cef_binary_value_t*(
CEF_CALLBACK* get_binary)(struct _cef_list_value_t* self, size_t index); CEF_CALLBACK* get_binary)(struct _cef_list_value_t* self, size_t index);
/// ///
// Returns the value at the specified index as type dictionary. The returned /// Returns the value at the specified index as type dictionary. The returned
// value will reference existing data and modifications to the value will /// value will reference existing data and modifications to the value will
// modify this object. /// modify this object.
/// ///
struct _cef_dictionary_value_t*(CEF_CALLBACK* get_dictionary)( struct _cef_dictionary_value_t*(CEF_CALLBACK* get_dictionary)(
struct _cef_list_value_t* self, struct _cef_list_value_t* self,
size_t index); size_t index);
/// ///
// Returns the value at the specified index as type list. The returned value /// Returns the value at the specified index as type list. The returned value
// will reference existing data and modifications to the value will modify /// will reference existing data and modifications to the value will modify
// this object. /// this object.
/// ///
struct _cef_list_value_t*( struct _cef_list_value_t*(
CEF_CALLBACK* get_list)(struct _cef_list_value_t* self, size_t index); CEF_CALLBACK* get_list)(struct _cef_list_value_t* self, size_t index);
/// ///
// Sets the value at the specified index. Returns true (1) if the value was /// Sets the value at the specified index. Returns true (1) if the value was
// set successfully. If |value| represents simple data then the underlying /// set successfully. If |value| represents simple data then the underlying
// data will be copied and modifications to |value| will not modify this /// data will be copied and modifications to |value| will not modify this
// object. If |value| represents complex data (binary, dictionary or list) /// object. If |value| represents complex data (binary, dictionary or list)
// then the underlying data will be referenced and modifications to |value| /// then the underlying data will be referenced and modifications to |value|
// will modify this object. /// will modify this object.
/// ///
int(CEF_CALLBACK* set_value)(struct _cef_list_value_t* self, int(CEF_CALLBACK* set_value)(struct _cef_list_value_t* self,
size_t index, size_t index,
struct _cef_value_t* value); struct _cef_value_t* value);
/// ///
// Sets the value at the specified index as type null. Returns true (1) if the /// Sets the value at the specified index as type null. Returns true (1) if
// value was set successfully. /// the value was set successfully.
/// ///
int(CEF_CALLBACK* set_null)(struct _cef_list_value_t* self, size_t index); int(CEF_CALLBACK* set_null)(struct _cef_list_value_t* self, size_t index);
/// ///
// Sets the value at the specified index as type bool. Returns true (1) if the /// Sets the value at the specified index as type bool. Returns true (1) if
// value was set successfully. /// the value was set successfully.
/// ///
int(CEF_CALLBACK* set_bool)(struct _cef_list_value_t* self, int(CEF_CALLBACK* set_bool)(struct _cef_list_value_t* self,
size_t index, size_t index,
int value); int value);
/// ///
// Sets the value at the specified index as type int. Returns true (1) if the /// Sets the value at the specified index as type int. Returns true (1) if the
// value was set successfully. /// value was set successfully.
/// ///
int(CEF_CALLBACK* set_int)(struct _cef_list_value_t* self, int(CEF_CALLBACK* set_int)(struct _cef_list_value_t* self,
size_t index, size_t index,
int value); int value);
/// ///
// Sets the value at the specified index as type double. Returns true (1) if /// Sets the value at the specified index as type double. Returns true (1) if
// the value was set successfully. /// the value was set successfully.
/// ///
int(CEF_CALLBACK* set_double)(struct _cef_list_value_t* self, int(CEF_CALLBACK* set_double)(struct _cef_list_value_t* self,
size_t index, size_t index,
double value); double value);
/// ///
// Sets the value at the specified index as type string. Returns true (1) if /// Sets the value at the specified index as type string. Returns true (1) if
// the value was set successfully. /// the value was set successfully.
/// ///
int(CEF_CALLBACK* set_string)(struct _cef_list_value_t* self, int(CEF_CALLBACK* set_string)(struct _cef_list_value_t* self,
size_t index, size_t index,
const cef_string_t* value); const cef_string_t* value);
/// ///
// Sets the value at the specified index as type binary. Returns true (1) if /// Sets the value at the specified index as type binary. Returns true (1) if
// the value was set successfully. If |value| is currently owned by another /// the value was set successfully. If |value| is currently owned by another
// object then the value will be copied and the |value| reference will not /// object then the value will be copied and the |value| reference will not
// change. Otherwise, ownership will be transferred to this object and the /// change. Otherwise, ownership will be transferred to this object and the
// |value| reference will be invalidated. /// |value| reference will be invalidated.
/// ///
int(CEF_CALLBACK* set_binary)(struct _cef_list_value_t* self, int(CEF_CALLBACK* set_binary)(struct _cef_list_value_t* self,
size_t index, size_t index,
struct _cef_binary_value_t* value); struct _cef_binary_value_t* value);
/// ///
// Sets the value at the specified index as type dict. Returns true (1) if the /// Sets the value at the specified index as type dict. Returns true (1) if
// value was set successfully. If |value| is currently owned by another object /// the value was set successfully. If |value| is currently owned by another
// then the value will be copied and the |value| reference will not change. /// object then the value will be copied and the |value| reference will not
// Otherwise, ownership will be transferred to this object and the |value| /// change. Otherwise, ownership will be transferred to this object and the
// reference will be invalidated. /// |value| reference will be invalidated.
/// ///
int(CEF_CALLBACK* set_dictionary)(struct _cef_list_value_t* self, int(CEF_CALLBACK* set_dictionary)(struct _cef_list_value_t* self,
size_t index, size_t index,
struct _cef_dictionary_value_t* value); struct _cef_dictionary_value_t* value);
/// ///
// Sets the value at the specified index as type list. Returns true (1) if the /// Sets the value at the specified index as type list. Returns true (1) if
// value was set successfully. If |value| is currently owned by another object /// the value was set successfully. If |value| is currently owned by another
// then the value will be copied and the |value| reference will not change. /// object then the value will be copied and the |value| reference will not
// Otherwise, ownership will be transferred to this object and the |value| /// change. Otherwise, ownership will be transferred to this object and the
// reference will be invalidated. /// |value| reference will be invalidated.
/// ///
int(CEF_CALLBACK* set_list)(struct _cef_list_value_t* self, int(CEF_CALLBACK* set_list)(struct _cef_list_value_t* self,
size_t index, size_t index,
@ -742,7 +744,7 @@ typedef struct _cef_list_value_t {
} cef_list_value_t; } cef_list_value_t;
/// ///
// Creates a new object that is not owned by any other object. /// Creates a new object that is not owned by any other object.
/// ///
CEF_EXPORT cef_list_value_t* cef_list_value_create(void); CEF_EXPORT cef_list_value_t* cef_list_value_create(void);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=aff380a4fa3f1a26063170381d47c67971511f1d$ // $hash=737b3ee4e678de14ebffec828d113b007e06c58d$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_WAITABLE_EVENT_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_WAITABLE_EVENT_CAPI_H_
@ -47,64 +47,64 @@ extern "C" {
#endif #endif
/// ///
// WaitableEvent is a thread synchronization tool that allows one thread to wait /// WaitableEvent is a thread synchronization tool that allows one thread to
// for another thread to finish some work. This is equivalent to using a /// wait for another thread to finish some work. This is equivalent to using a
// Lock+ConditionVariable to protect a simple boolean value. However, using /// Lock+ConditionVariable to protect a simple boolean value. However, using
// WaitableEvent in conjunction with a Lock to wait for a more complex state /// WaitableEvent in conjunction with a Lock to wait for a more complex state
// change (e.g., for an item to be added to a queue) is not recommended. In that /// change (e.g., for an item to be added to a queue) is not recommended. In
// case consider using a ConditionVariable instead of a WaitableEvent. It is /// that case consider using a ConditionVariable instead of a WaitableEvent. It
// safe to create and/or signal a WaitableEvent from any thread. Blocking on a /// is safe to create and/or signal a WaitableEvent from any thread. Blocking on
// WaitableEvent by calling the *wait() functions is not allowed on the browser /// a WaitableEvent by calling the *wait() functions is not allowed on the
// process UI or IO threads. /// browser process UI or IO threads.
/// ///
typedef struct _cef_waitable_event_t { typedef struct _cef_waitable_event_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Put the event in the un-signaled state. /// Put the event in the un-signaled state.
/// ///
void(CEF_CALLBACK* reset)(struct _cef_waitable_event_t* self); void(CEF_CALLBACK* reset)(struct _cef_waitable_event_t* self);
/// ///
// Put the event in the signaled state. This causes any thread blocked on Wait /// Put the event in the signaled state. This causes any thread blocked on
// to be woken up. /// Wait to be woken up.
/// ///
void(CEF_CALLBACK* signal)(struct _cef_waitable_event_t* self); void(CEF_CALLBACK* signal)(struct _cef_waitable_event_t* self);
/// ///
// Returns true (1) if the event is in the signaled state, else false (0). If /// Returns true (1) if the event is in the signaled state, else false (0). If
// the event was created with |automatic_reset| set to true (1) then calling /// the event was created with |automatic_reset| set to true (1) then calling
// this function will also cause a reset. /// this function will also cause a reset.
/// ///
int(CEF_CALLBACK* is_signaled)(struct _cef_waitable_event_t* self); int(CEF_CALLBACK* is_signaled)(struct _cef_waitable_event_t* self);
/// ///
// Wait indefinitely for the event to be signaled. This function will not /// Wait indefinitely for the event to be signaled. This function will not
// return until after the call to signal() has completed. This function cannot /// return until after the call to signal() has completed. This function
// be called on the browser process UI or IO threads. /// cannot be called on the browser process UI or IO threads.
/// ///
void(CEF_CALLBACK* wait)(struct _cef_waitable_event_t* self); void(CEF_CALLBACK* wait)(struct _cef_waitable_event_t* self);
/// ///
// Wait up to |max_ms| milliseconds for the event to be signaled. Returns true /// Wait up to |max_ms| milliseconds for the event to be signaled. Returns
// (1) if the event was signaled. A return value of false (0) does not /// true (1) if the event was signaled. A return value of false (0) does not
// necessarily mean that |max_ms| was exceeded. This function will not return /// necessarily mean that |max_ms| was exceeded. This function will not return
// until after the call to signal() has completed. This function cannot be /// until after the call to signal() has completed. This function cannot be
// called on the browser process UI or IO threads. /// called on the browser process UI or IO threads.
/// ///
int(CEF_CALLBACK* timed_wait)(struct _cef_waitable_event_t* self, int(CEF_CALLBACK* timed_wait)(struct _cef_waitable_event_t* self,
int64 max_ms); int64 max_ms);
} cef_waitable_event_t; } cef_waitable_event_t;
/// ///
// Create a new waitable event. If |automatic_reset| is true (1) then the event /// Create a new waitable event. If |automatic_reset| is true (1) then the event
// state is automatically reset to un-signaled after a single waiting thread has /// state is automatically reset to un-signaled after a single waiting thread
// been released; otherwise, the state remains signaled until reset() is called /// has been released; otherwise, the state remains signaled until reset() is
// manually. If |initially_signaled| is true (1) then the event will start in /// called manually. If |initially_signaled| is true (1) then the event will
// the signaled state. /// start in the signaled state.
/// ///
CEF_EXPORT cef_waitable_event_t* cef_waitable_event_create( CEF_EXPORT cef_waitable_event_t* cef_waitable_event_create(
int automatic_reset, int automatic_reset,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=744c34b8608d3678f0a3522ff77f184611a29bf2$ // $hash=1d551ff4900e1792bc2d89bebcda1707b8d9c985$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_X509_CERTIFICATE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_X509_CERTIFICATE_CAPI_H_
@ -48,74 +48,74 @@ extern "C" {
#endif #endif
/// ///
// Structure representing the issuer or subject field of an X.509 certificate. /// Structure representing the issuer or subject field of an X.509 certificate.
/// ///
typedef struct _cef_x509cert_principal_t { typedef struct _cef_x509cert_principal_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns a name that can be used to represent the issuer. It tries in this /// Returns a name that can be used to represent the issuer. It tries in this
// order: Common Name (CN), Organization Name (O) and Organizational Unit Name /// order: Common Name (CN), Organization Name (O) and Organizational Unit
// (OU) and returns the first non-NULL one found. /// Name (OU) and returns the first non-NULL one found.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_display_name)( cef_string_userfree_t(CEF_CALLBACK* get_display_name)(
struct _cef_x509cert_principal_t* self); struct _cef_x509cert_principal_t* self);
/// ///
// Returns the common name. /// Returns the common name.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_common_name)( cef_string_userfree_t(CEF_CALLBACK* get_common_name)(
struct _cef_x509cert_principal_t* self); struct _cef_x509cert_principal_t* self);
/// ///
// Returns the locality name. /// Returns the locality name.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_locality_name)( cef_string_userfree_t(CEF_CALLBACK* get_locality_name)(
struct _cef_x509cert_principal_t* self); struct _cef_x509cert_principal_t* self);
/// ///
// Returns the state or province name. /// Returns the state or province name.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_state_or_province_name)( cef_string_userfree_t(CEF_CALLBACK* get_state_or_province_name)(
struct _cef_x509cert_principal_t* self); struct _cef_x509cert_principal_t* self);
/// ///
// Returns the country name. /// Returns the country name.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_country_name)( cef_string_userfree_t(CEF_CALLBACK* get_country_name)(
struct _cef_x509cert_principal_t* self); struct _cef_x509cert_principal_t* self);
/// ///
// Retrieve the list of street addresses. /// Retrieve the list of street addresses.
/// ///
void(CEF_CALLBACK* get_street_addresses)( void(CEF_CALLBACK* get_street_addresses)(
struct _cef_x509cert_principal_t* self, struct _cef_x509cert_principal_t* self,
cef_string_list_t addresses); cef_string_list_t addresses);
/// ///
// Retrieve the list of organization names. /// Retrieve the list of organization names.
/// ///
void(CEF_CALLBACK* get_organization_names)( void(CEF_CALLBACK* get_organization_names)(
struct _cef_x509cert_principal_t* self, struct _cef_x509cert_principal_t* self,
cef_string_list_t names); cef_string_list_t names);
/// ///
// Retrieve the list of organization unit names. /// Retrieve the list of organization unit names.
/// ///
void(CEF_CALLBACK* get_organization_unit_names)( void(CEF_CALLBACK* get_organization_unit_names)(
struct _cef_x509cert_principal_t* self, struct _cef_x509cert_principal_t* self,
cef_string_list_t names); cef_string_list_t names);
/// ///
// Retrieve the list of domain components. /// Retrieve the list of domain components.
/// ///
void(CEF_CALLBACK* get_domain_components)( void(CEF_CALLBACK* get_domain_components)(
struct _cef_x509cert_principal_t* self, struct _cef_x509cert_principal_t* self,
@ -123,72 +123,72 @@ typedef struct _cef_x509cert_principal_t {
} cef_x509cert_principal_t; } cef_x509cert_principal_t;
/// ///
// Structure representing a X.509 certificate. /// Structure representing a X.509 certificate.
/// ///
typedef struct _cef_x509certificate_t { typedef struct _cef_x509certificate_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns the subject of the X.509 certificate. For HTTPS server certificates /// Returns the subject of the X.509 certificate. For HTTPS server
// this represents the web server. The common name of the subject should /// certificates this represents the web server. The common name of the
// match the host name of the web server. /// subject should match the host name of the web server.
/// ///
struct _cef_x509cert_principal_t*(CEF_CALLBACK* get_subject)( struct _cef_x509cert_principal_t*(CEF_CALLBACK* get_subject)(
struct _cef_x509certificate_t* self); struct _cef_x509certificate_t* self);
/// ///
// Returns the issuer of the X.509 certificate. /// Returns the issuer of the X.509 certificate.
/// ///
struct _cef_x509cert_principal_t*(CEF_CALLBACK* get_issuer)( struct _cef_x509cert_principal_t*(CEF_CALLBACK* get_issuer)(
struct _cef_x509certificate_t* self); struct _cef_x509certificate_t* self);
/// ///
// Returns the DER encoded serial number for the X.509 certificate. The value /// Returns the DER encoded serial number for the X.509 certificate. The value
// possibly includes a leading 00 byte. /// possibly includes a leading 00 byte.
/// ///
struct _cef_binary_value_t*(CEF_CALLBACK* get_serial_number)( struct _cef_binary_value_t*(CEF_CALLBACK* get_serial_number)(
struct _cef_x509certificate_t* self); struct _cef_x509certificate_t* self);
/// ///
// Returns the date before which the X.509 certificate is invalid. /// Returns the date before which the X.509 certificate is invalid.
// CefBaseTime.GetTimeT() will return 0 if no date was specified. /// CefBaseTime.GetTimeT() will return 0 if no date was specified.
/// ///
cef_basetime_t(CEF_CALLBACK* get_valid_start)( cef_basetime_t(CEF_CALLBACK* get_valid_start)(
struct _cef_x509certificate_t* self); struct _cef_x509certificate_t* self);
/// ///
// Returns the date after which the X.509 certificate is invalid. /// Returns the date after which the X.509 certificate is invalid.
// CefBaseTime.GetTimeT() will return 0 if no date was specified. /// CefBaseTime.GetTimeT() will return 0 if no date was specified.
/// ///
cef_basetime_t(CEF_CALLBACK* get_valid_expiry)( cef_basetime_t(CEF_CALLBACK* get_valid_expiry)(
struct _cef_x509certificate_t* self); struct _cef_x509certificate_t* self);
/// ///
// Returns the DER encoded data for the X.509 certificate. /// Returns the DER encoded data for the X.509 certificate.
/// ///
struct _cef_binary_value_t*(CEF_CALLBACK* get_derencoded)( struct _cef_binary_value_t*(CEF_CALLBACK* get_derencoded)(
struct _cef_x509certificate_t* self); struct _cef_x509certificate_t* self);
/// ///
// Returns the PEM encoded data for the X.509 certificate. /// Returns the PEM encoded data for the X.509 certificate.
/// ///
struct _cef_binary_value_t*(CEF_CALLBACK* get_pemencoded)( struct _cef_binary_value_t*(CEF_CALLBACK* get_pemencoded)(
struct _cef_x509certificate_t* self); struct _cef_x509certificate_t* self);
/// ///
// Returns the number of certificates in the issuer chain. If 0, the /// Returns the number of certificates in the issuer chain. If 0, the
// certificate is self-signed. /// certificate is self-signed.
/// ///
size_t(CEF_CALLBACK* get_issuer_chain_size)( size_t(CEF_CALLBACK* get_issuer_chain_size)(
struct _cef_x509certificate_t* self); struct _cef_x509certificate_t* self);
/// ///
// Returns the DER encoded data for the certificate issuer chain. If we failed /// Returns the DER encoded data for the certificate issuer chain. If we
// to encode a certificate in the chain it is still present in the array but /// failed to encode a certificate in the chain it is still present in the
// is an NULL string. /// array but is an NULL string.
/// ///
void(CEF_CALLBACK* get_derencoded_issuer_chain)( void(CEF_CALLBACK* get_derencoded_issuer_chain)(
struct _cef_x509certificate_t* self, struct _cef_x509certificate_t* self,
@ -196,9 +196,9 @@ typedef struct _cef_x509certificate_t {
struct _cef_binary_value_t** chain); struct _cef_binary_value_t** chain);
/// ///
// Returns the PEM encoded data for the certificate issuer chain. If we failed /// Returns the PEM encoded data for the certificate issuer chain. If we
// to encode a certificate in the chain it is still present in the array but /// failed to encode a certificate in the chain it is still present in the
// is an NULL string. /// array but is an NULL string.
/// ///
void(CEF_CALLBACK* get_pemencoded_issuer_chain)( void(CEF_CALLBACK* get_pemencoded_issuer_chain)(
struct _cef_x509certificate_t* self, struct _cef_x509certificate_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=c3bdf957dfd307568842b95599e3259d4c8d8f44$ // $hash=988d13daa86a6ed89d2116e44d2307ee01c63c08$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_XML_READER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_XML_READER_CAPI_H_
@ -48,132 +48,129 @@ extern "C" {
#endif #endif
/// ///
// Structure that supports the reading of XML data via the libxml streaming API. /// Structure that supports the reading of XML data via the libxml streaming
// The functions of this structure should only be called on the thread that /// API. The functions of this structure should only be called on the thread
// creates the object. /// that creates the object.
/// ///
typedef struct _cef_xml_reader_t { typedef struct _cef_xml_reader_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Moves the cursor to the next node in the document. This function must be /// Moves the cursor to the next node in the document. This function must be
// called at least once to set the current cursor position. Returns true (1) /// called at least once to set the current cursor position. Returns true (1)
// if the cursor position was set successfully. /// if the cursor position was set successfully.
/// ///
int(CEF_CALLBACK* move_to_next_node)(struct _cef_xml_reader_t* self); int(CEF_CALLBACK* move_to_next_node)(struct _cef_xml_reader_t* self);
/// ///
// Close the document. This should be called directly to ensure that cleanup /// Close the document. This should be called directly to ensure that cleanup
// occurs on the correct thread. /// occurs on the correct thread.
/// ///
int(CEF_CALLBACK* close)(struct _cef_xml_reader_t* self); int(CEF_CALLBACK* close)(struct _cef_xml_reader_t* self);
/// ///
// Returns true (1) if an error has been reported by the XML parser. /// Returns true (1) if an error has been reported by the XML parser.
/// ///
int(CEF_CALLBACK* has_error)(struct _cef_xml_reader_t* self); int(CEF_CALLBACK* has_error)(struct _cef_xml_reader_t* self);
/// ///
// Returns the error string. /// Returns the error string.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_error)( cef_string_userfree_t(CEF_CALLBACK* get_error)(
struct _cef_xml_reader_t* self); struct _cef_xml_reader_t* self);
// The below functions retrieve data for the node at the current cursor
// position.
/// ///
// Returns the node type. /// Returns the node type.
/// ///
cef_xml_node_type_t(CEF_CALLBACK* get_type)(struct _cef_xml_reader_t* self); cef_xml_node_type_t(CEF_CALLBACK* get_type)(struct _cef_xml_reader_t* self);
/// ///
// Returns the node depth. Depth starts at 0 for the root node. /// Returns the node depth. Depth starts at 0 for the root node.
/// ///
int(CEF_CALLBACK* get_depth)(struct _cef_xml_reader_t* self); int(CEF_CALLBACK* get_depth)(struct _cef_xml_reader_t* self);
/// ///
// Returns the local name. See http://www.w3.org/TR/REC-xml-names/#NT- /// Returns the local name. See http://www.w3.org/TR/REC-xml-names/#NT-
// LocalPart for additional details. /// LocalPart for additional details.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_local_name)( cef_string_userfree_t(CEF_CALLBACK* get_local_name)(
struct _cef_xml_reader_t* self); struct _cef_xml_reader_t* self);
/// ///
// Returns the namespace prefix. See http://www.w3.org/TR/REC-xml-names/ for /// Returns the namespace prefix. See http://www.w3.org/TR/REC-xml-names/ for
// additional details. /// additional details.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_prefix)( cef_string_userfree_t(CEF_CALLBACK* get_prefix)(
struct _cef_xml_reader_t* self); struct _cef_xml_reader_t* self);
/// ///
// Returns the qualified name, equal to (Prefix:)LocalName. See /// Returns the qualified name, equal to (Prefix:)LocalName. See
// http://www.w3.org/TR/REC-xml-names/#ns-qualnames for additional details. /// http://www.w3.org/TR/REC-xml-names/#ns-qualnames for additional details.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_qualified_name)( cef_string_userfree_t(CEF_CALLBACK* get_qualified_name)(
struct _cef_xml_reader_t* self); struct _cef_xml_reader_t* self);
/// ///
// Returns the URI defining the namespace associated with the node. See /// Returns the URI defining the namespace associated with the node. See
// http://www.w3.org/TR/REC-xml-names/ for additional details. /// http://www.w3.org/TR/REC-xml-names/ for additional details.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_namespace_uri)( cef_string_userfree_t(CEF_CALLBACK* get_namespace_uri)(
struct _cef_xml_reader_t* self); struct _cef_xml_reader_t* self);
/// ///
// Returns the base URI of the node. See http://www.w3.org/TR/xmlbase/ for /// Returns the base URI of the node. See http://www.w3.org/TR/xmlbase/ for
// additional details. /// additional details.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_base_uri)( cef_string_userfree_t(CEF_CALLBACK* get_base_uri)(
struct _cef_xml_reader_t* self); struct _cef_xml_reader_t* self);
/// ///
// Returns the xml:lang scope within which the node resides. See /// Returns the xml:lang scope within which the node resides. See
// http://www.w3.org/TR/REC-xml/#sec-lang-tag for additional details. /// http://www.w3.org/TR/REC-xml/#sec-lang-tag for additional details.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_xml_lang)( cef_string_userfree_t(CEF_CALLBACK* get_xml_lang)(
struct _cef_xml_reader_t* self); struct _cef_xml_reader_t* self);
/// ///
// Returns true (1) if the node represents an NULL element. <a/> is considered /// Returns true (1) if the node represents an NULL element. "<a/>" is
// NULL but <a></a> is not. /// considered NULL but "<a></a>" is not.
/// ///
int(CEF_CALLBACK* is_empty_element)(struct _cef_xml_reader_t* self); int(CEF_CALLBACK* is_empty_element)(struct _cef_xml_reader_t* self);
/// ///
// Returns true (1) if the node has a text value. /// Returns true (1) if the node has a text value.
/// ///
int(CEF_CALLBACK* has_value)(struct _cef_xml_reader_t* self); int(CEF_CALLBACK* has_value)(struct _cef_xml_reader_t* self);
/// ///
// Returns the text value. /// Returns the text value.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_value)( cef_string_userfree_t(CEF_CALLBACK* get_value)(
struct _cef_xml_reader_t* self); struct _cef_xml_reader_t* self);
/// ///
// Returns true (1) if the node has attributes. /// Returns true (1) if the node has attributes.
/// ///
int(CEF_CALLBACK* has_attributes)(struct _cef_xml_reader_t* self); int(CEF_CALLBACK* has_attributes)(struct _cef_xml_reader_t* self);
/// ///
// Returns the number of attributes. /// Returns the number of attributes.
/// ///
size_t(CEF_CALLBACK* get_attribute_count)(struct _cef_xml_reader_t* self); size_t(CEF_CALLBACK* get_attribute_count)(struct _cef_xml_reader_t* self);
/// ///
// Returns the value of the attribute at the specified 0-based index. /// Returns the value of the attribute at the specified 0-based index.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_attribute_byindex)( cef_string_userfree_t(CEF_CALLBACK* get_attribute_byindex)(
@ -181,7 +178,7 @@ typedef struct _cef_xml_reader_t {
int index); int index);
/// ///
// Returns the value of the attribute with the specified qualified name. /// Returns the value of the attribute with the specified qualified name.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_attribute_byqname)( cef_string_userfree_t(CEF_CALLBACK* get_attribute_byqname)(
@ -189,8 +186,8 @@ typedef struct _cef_xml_reader_t {
const cef_string_t* qualifiedName); const cef_string_t* qualifiedName);
/// ///
// Returns the value of the attribute with the specified local name and /// Returns the value of the attribute with the specified local name and
// namespace URI. /// namespace URI.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_attribute_bylname)( cef_string_userfree_t(CEF_CALLBACK* get_attribute_bylname)(
@ -199,48 +196,43 @@ typedef struct _cef_xml_reader_t {
const cef_string_t* namespaceURI); const cef_string_t* namespaceURI);
/// ///
// Returns an XML representation of the current node's children. /// Returns an XML representation of the current node's children.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_inner_xml)( cef_string_userfree_t(CEF_CALLBACK* get_inner_xml)(
struct _cef_xml_reader_t* self); struct _cef_xml_reader_t* self);
/// ///
// Returns an XML representation of the current node including its children. /// Returns an XML representation of the current node including its children.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_outer_xml)( cef_string_userfree_t(CEF_CALLBACK* get_outer_xml)(
struct _cef_xml_reader_t* self); struct _cef_xml_reader_t* self);
/// ///
// Returns the line number for the current node. /// Returns the line number for the current node.
/// ///
int(CEF_CALLBACK* get_line_number)(struct _cef_xml_reader_t* self); int(CEF_CALLBACK* get_line_number)(struct _cef_xml_reader_t* self);
// Attribute nodes are not traversed by default. The below functions can be
// used to move the cursor to an attribute node. move_to_carrying_element()
// can be called afterwards to return the cursor to the carrying element. The
// depth of an attribute node will be 1 + the depth of the carrying element.
/// ///
// Moves the cursor to the attribute at the specified 0-based index. Returns /// Moves the cursor to the attribute at the specified 0-based index. Returns
// true (1) if the cursor position was set successfully. /// true (1) if the cursor position was set successfully.
/// ///
int(CEF_CALLBACK* move_to_attribute_byindex)(struct _cef_xml_reader_t* self, int(CEF_CALLBACK* move_to_attribute_byindex)(struct _cef_xml_reader_t* self,
int index); int index);
/// ///
// Moves the cursor to the attribute with the specified qualified name. /// Moves the cursor to the attribute with the specified qualified name.
// Returns true (1) if the cursor position was set successfully. /// Returns true (1) if the cursor position was set successfully.
/// ///
int(CEF_CALLBACK* move_to_attribute_byqname)( int(CEF_CALLBACK* move_to_attribute_byqname)(
struct _cef_xml_reader_t* self, struct _cef_xml_reader_t* self,
const cef_string_t* qualifiedName); const cef_string_t* qualifiedName);
/// ///
// Moves the cursor to the attribute with the specified local name and /// Moves the cursor to the attribute with the specified local name and
// namespace URI. Returns true (1) if the cursor position was set /// namespace URI. Returns true (1) if the cursor position was set
// successfully. /// successfully.
/// ///
int(CEF_CALLBACK* move_to_attribute_bylname)( int(CEF_CALLBACK* move_to_attribute_bylname)(
struct _cef_xml_reader_t* self, struct _cef_xml_reader_t* self,
@ -248,27 +240,27 @@ typedef struct _cef_xml_reader_t {
const cef_string_t* namespaceURI); const cef_string_t* namespaceURI);
/// ///
// Moves the cursor to the first attribute in the current element. Returns /// Moves the cursor to the first attribute in the current element. Returns
// true (1) if the cursor position was set successfully. /// true (1) if the cursor position was set successfully.
/// ///
int(CEF_CALLBACK* move_to_first_attribute)(struct _cef_xml_reader_t* self); int(CEF_CALLBACK* move_to_first_attribute)(struct _cef_xml_reader_t* self);
/// ///
// Moves the cursor to the next attribute in the current element. Returns true /// Moves the cursor to the next attribute in the current element. Returns
// (1) if the cursor position was set successfully. /// true (1) if the cursor position was set successfully.
/// ///
int(CEF_CALLBACK* move_to_next_attribute)(struct _cef_xml_reader_t* self); int(CEF_CALLBACK* move_to_next_attribute)(struct _cef_xml_reader_t* self);
/// ///
// Moves the cursor back to the carrying element. Returns true (1) if the /// Moves the cursor back to the carrying element. Returns true (1) if the
// cursor position was set successfully. /// cursor position was set successfully.
/// ///
int(CEF_CALLBACK* move_to_carrying_element)(struct _cef_xml_reader_t* self); int(CEF_CALLBACK* move_to_carrying_element)(struct _cef_xml_reader_t* self);
} cef_xml_reader_t; } cef_xml_reader_t;
/// ///
// Create a new cef_xml_reader_t object. The returned object's functions can /// Create a new cef_xml_reader_t object. The returned object's functions can
// only be called from the thread that created the object. /// only be called from the thread that created the object.
/// ///
CEF_EXPORT cef_xml_reader_t* cef_xml_reader_create( CEF_EXPORT cef_xml_reader_t* cef_xml_reader_create(
struct _cef_stream_reader_t* stream, struct _cef_stream_reader_t* stream,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=e16856adecfe81b59b513568b5dcadc851ff07ab$ // $hash=5e121ff2140e0f1228fd8e2ad632c804ab854210$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_ZIP_READER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_ZIP_READER_CAPI_H_
@ -48,97 +48,95 @@ extern "C" {
#endif #endif
/// ///
// Structure that supports the reading of zip archives via the zlib unzip API. /// Structure that supports the reading of zip archives via the zlib unzip API.
// The functions of this structure should only be called on the thread that /// The functions of this structure should only be called on the thread that
// creates the object. /// creates the object.
/// ///
typedef struct _cef_zip_reader_t { typedef struct _cef_zip_reader_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Moves the cursor to the first file in the archive. Returns true (1) if the /// Moves the cursor to the first file in the archive. Returns true (1) if the
// cursor position was set successfully. /// cursor position was set successfully.
/// ///
int(CEF_CALLBACK* move_to_first_file)(struct _cef_zip_reader_t* self); int(CEF_CALLBACK* move_to_first_file)(struct _cef_zip_reader_t* self);
/// ///
// Moves the cursor to the next file in the archive. Returns true (1) if the /// Moves the cursor to the next file in the archive. Returns true (1) if the
// cursor position was set successfully. /// cursor position was set successfully.
/// ///
int(CEF_CALLBACK* move_to_next_file)(struct _cef_zip_reader_t* self); int(CEF_CALLBACK* move_to_next_file)(struct _cef_zip_reader_t* self);
/// ///
// Moves the cursor to the specified file in the archive. If |caseSensitive| /// Moves the cursor to the specified file in the archive. If |caseSensitive|
// is true (1) then the search will be case sensitive. Returns true (1) if the /// is true (1) then the search will be case sensitive. Returns true (1) if
// cursor position was set successfully. /// the cursor position was set successfully.
/// ///
int(CEF_CALLBACK* move_to_file)(struct _cef_zip_reader_t* self, int(CEF_CALLBACK* move_to_file)(struct _cef_zip_reader_t* self,
const cef_string_t* fileName, const cef_string_t* fileName,
int caseSensitive); int caseSensitive);
/// ///
// Closes the archive. This should be called directly to ensure that cleanup /// Closes the archive. This should be called directly to ensure that cleanup
// occurs on the correct thread. /// occurs on the correct thread.
/// ///
int(CEF_CALLBACK* close)(struct _cef_zip_reader_t* self); int(CEF_CALLBACK* close)(struct _cef_zip_reader_t* self);
// The below functions act on the file at the current cursor position.
/// ///
// Returns the name of the file. /// Returns the name of the file.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_file_name)( cef_string_userfree_t(CEF_CALLBACK* get_file_name)(
struct _cef_zip_reader_t* self); struct _cef_zip_reader_t* self);
/// ///
// Returns the uncompressed size of the file. /// Returns the uncompressed size of the file.
/// ///
int64(CEF_CALLBACK* get_file_size)(struct _cef_zip_reader_t* self); int64(CEF_CALLBACK* get_file_size)(struct _cef_zip_reader_t* self);
/// ///
// Returns the last modified timestamp for the file. /// Returns the last modified timestamp for the file.
/// ///
cef_basetime_t(CEF_CALLBACK* get_file_last_modified)( cef_basetime_t(CEF_CALLBACK* get_file_last_modified)(
struct _cef_zip_reader_t* self); struct _cef_zip_reader_t* self);
/// ///
// Opens the file for reading of uncompressed data. A read password may /// Opens the file for reading of uncompressed data. A read password may
// optionally be specified. /// optionally be specified.
/// ///
int(CEF_CALLBACK* open_file)(struct _cef_zip_reader_t* self, int(CEF_CALLBACK* open_file)(struct _cef_zip_reader_t* self,
const cef_string_t* password); const cef_string_t* password);
/// ///
// Closes the file. /// Closes the file.
/// ///
int(CEF_CALLBACK* close_file)(struct _cef_zip_reader_t* self); int(CEF_CALLBACK* close_file)(struct _cef_zip_reader_t* self);
/// ///
// Read uncompressed file contents into the specified buffer. Returns < 0 if /// Read uncompressed file contents into the specified buffer. Returns < 0 if
// an error occurred, 0 if at the end of file, or the number of bytes read. /// an error occurred, 0 if at the end of file, or the number of bytes read.
/// ///
int(CEF_CALLBACK* read_file)(struct _cef_zip_reader_t* self, int(CEF_CALLBACK* read_file)(struct _cef_zip_reader_t* self,
void* buffer, void* buffer,
size_t bufferSize); size_t bufferSize);
/// ///
// Returns the current offset in the uncompressed file contents. /// Returns the current offset in the uncompressed file contents.
/// ///
int64(CEF_CALLBACK* tell)(struct _cef_zip_reader_t* self); int64(CEF_CALLBACK* tell)(struct _cef_zip_reader_t* self);
/// ///
// Returns true (1) if at end of the file contents. /// Returns true (1) if at end of the file contents.
/// ///
int(CEF_CALLBACK* eof)(struct _cef_zip_reader_t* self); int(CEF_CALLBACK* eof)(struct _cef_zip_reader_t* self);
} cef_zip_reader_t; } cef_zip_reader_t;
/// ///
// Create a new cef_zip_reader_t object. The returned object's functions can /// Create a new cef_zip_reader_t object. The returned object's functions can
// only be called from the thread that created the object. /// only be called from the thread that created the object.
/// ///
CEF_EXPORT cef_zip_reader_t* cef_zip_reader_create( CEF_EXPORT cef_zip_reader_t* cef_zip_reader_create(
struct _cef_stream_reader_t* stream); struct _cef_stream_reader_t* stream);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=20fc4636e154ab38b79287c29f8f7f22e3cd8d37$ // $hash=cdc9af1b664e49e339ab7bb50d04a7ea385e07e5$
// //
#ifndef CEF_INCLUDE_CAPI_TEST_CEF_TEST_HELPERS_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_TEST_CEF_TEST_HELPERS_CAPI_H_
@ -52,18 +52,18 @@ extern "C" {
#endif #endif
/// ///
// Execute JavaScript with a user gesture to trigger functionality like /// Execute JavaScript with a user gesture to trigger functionality like
// onbeforeunload handlers that will otherwise be blocked. /// onbeforeunload handlers that will otherwise be blocked.
/// ///
CEF_EXPORT void cef_execute_java_script_with_user_gesture_for_tests( CEF_EXPORT void cef_execute_java_script_with_user_gesture_for_tests(
struct _cef_frame_t* frame, struct _cef_frame_t* frame,
const cef_string_t* javascript); const cef_string_t* javascript);
/// ///
// Set the DIR_SRC_TEST_DATA_ROOT directory used to load test data. Must be /// Set the DIR_SRC_TEST_DATA_ROOT directory used to load test data. Must be
// configured when running from a CEF binary distribution. Defaults to the /// configured when running from a CEF binary distribution. Defaults to the
// "chromium/src" directory when running from a local CEF/Chromium build. |dir| /// "chromium/src" directory when running from a local CEF/Chromium build. |dir|
// must be an absolute path. /// must be an absolute path.
/// ///
CEF_EXPORT void cef_set_data_directory_for_tests(const cef_string_t* dir); CEF_EXPORT void cef_set_data_directory_for_tests(const cef_string_t* dir);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=25eed585e3c8deea88f194fbfb8aca923c778892$ // $hash=7dc00d6af4e26812b78e47ec707f8d271c043a8e$
// //
#ifndef CEF_INCLUDE_CAPI_TEST_CEF_TEST_SERVER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_TEST_CEF_TEST_SERVER_CAPI_H_
@ -56,31 +56,31 @@ struct _cef_test_server_connection_t;
struct _cef_test_server_handler_t; struct _cef_test_server_handler_t;
/// ///
// Structure representing an embedded test server that supports HTTP/HTTPS /// Structure representing an embedded test server that supports HTTP/HTTPS
// requests. This is a basic server providing only an essential subset of the /// requests. This is a basic server providing only an essential subset of the
// HTTP/1.1 protocol. Especially, it assumes that the request syntax is correct. /// HTTP/1.1 protocol. Especially, it assumes that the request syntax is
// It *does not* support a Chunked Transfer Encoding. Server capacity is limited /// correct. It *does not* support a Chunked Transfer Encoding. Server capacity
// and is intended to handle only a small number of simultaneous connections /// is limited and is intended to handle only a small number of simultaneous
// (e.g. for communicating between applications on localhost). The functions of /// connections (e.g. for communicating between applications on localhost). The
// this structure are safe to call from any thread in the brower process unless /// functions of this structure are safe to call from any thread in the brower
// otherwise indicated. /// process unless otherwise indicated.
/// ///
typedef struct _cef_test_server_t { typedef struct _cef_test_server_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Stop the server and shut down the dedicated server thread. This function /// Stop the server and shut down the dedicated server thread. This function
// must be called on the same thread as CreateAndStart. It will block until /// must be called on the same thread as CreateAndStart. It will block until
// the dedicated server thread has shut down. /// the dedicated server thread has shut down.
/// ///
void(CEF_CALLBACK* stop)(struct _cef_test_server_t* self); void(CEF_CALLBACK* stop)(struct _cef_test_server_t* self);
/// ///
// Returns the server origin including the port number (e.g. /// Returns the server origin including the port number (e.g.
// "[http|https]://127.0.0.1:<port>". /// "[http|https]://127.0.0.1:<port>".
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_origin)( cef_string_userfree_t(CEF_CALLBACK* get_origin)(
@ -88,20 +88,20 @@ typedef struct _cef_test_server_t {
} cef_test_server_t; } cef_test_server_t;
/// ///
// Create and start a new test server that binds to |port|. If |port| is 0 an /// Create and start a new test server that binds to |port|. If |port| is 0 an
// available port number will be selected. If |https_server| is true (1) the /// available port number will be selected. If |https_server| is true (1) the
// server will be HTTPS, otherwise it will be HTTP. When |https_server| is true /// server will be HTTPS, otherwise it will be HTTP. When |https_server| is true
// (1) the |https_cert_type| value is used to configure the certificate type. /// (1) the |https_cert_type| value is used to configure the certificate type.
// Returns the newly created server object on success, or nullptr if the server /// Returns the newly created server object on success, or nullptr if the server
// cannot be started. /// cannot be started.
// ///
// A new thread will be created for each CreateAndStart call (the "dedicated /// A new thread will be created for each CreateAndStart call (the "dedicated
// server thread"). It is therefore recommended to use a different /// server thread"). It is therefore recommended to use a different
// cef_test_server_handler_t instance for each CreateAndStart call to avoid /// cef_test_server_handler_t instance for each CreateAndStart call to avoid
// thread safety issues in the cef_test_server_handler_t implementation. /// thread safety issues in the cef_test_server_handler_t implementation.
// ///
// On success, this function will block until the dedicated server thread has /// On success, this function will block until the dedicated server thread has
// started. The server will continue running until Stop is called. /// started. The server will continue running until Stop is called.
/// ///
CEF_EXPORT cef_test_server_t* cef_test_server_create_and_start( CEF_EXPORT cef_test_server_t* cef_test_server_create_and_start(
uint16 port, uint16 port,
@ -110,22 +110,22 @@ CEF_EXPORT cef_test_server_t* cef_test_server_create_and_start(
struct _cef_test_server_handler_t* handler); struct _cef_test_server_handler_t* handler);
/// ///
// Implement this structure to handle test server requests. A new thread will be /// Implement this structure to handle test server requests. A new thread will
// created for each cef_test_server_t::CreateAndStart call (the "dedicated /// be created for each cef_test_server_t::CreateAndStart call (the "dedicated
// server thread"), and the functions of this structure will be called on that /// server thread"), and the functions of this structure will be called on that
// thread. See related documentation on cef_test_server_t::CreateAndStart. /// thread. See related documentation on cef_test_server_t::CreateAndStart.
/// ///
typedef struct _cef_test_server_handler_t { typedef struct _cef_test_server_handler_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Called when |server| receives a request. To handle the request return true /// Called when |server| receives a request. To handle the request return true
// (1) and use |connection| to send the response either synchronously or /// (1) and use |connection| to send the response either synchronously or
// asynchronously. Otherwise, return false (0) if the request is unhandled. /// asynchronously. Otherwise, return false (0) if the request is unhandled.
// When returning false (0) do not call any |connection| functions. /// When returning false (0) do not call any |connection| functions.
/// ///
int(CEF_CALLBACK* on_test_server_request)( int(CEF_CALLBACK* on_test_server_request)(
struct _cef_test_server_handler_t* self, struct _cef_test_server_handler_t* self,
@ -135,21 +135,21 @@ typedef struct _cef_test_server_handler_t {
} cef_test_server_handler_t; } cef_test_server_handler_t;
/// ///
// Structure representing a test server connection. The functions of this /// Structure representing a test server connection. The functions of this
// structure are safe to call from any thread in the brower process unless /// structure are safe to call from any thread in the brower process unless
// otherwise indicated. /// otherwise indicated.
/// ///
typedef struct _cef_test_server_connection_t { typedef struct _cef_test_server_connection_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Send an HTTP 200 "OK" response. |content_type| is the response content type /// Send an HTTP 200 "OK" response. |content_type| is the response content
// (e.g. "text/html"). |data| is the response content and |data_size| is the /// type (e.g. "text/html"). |data| is the response content and |data_size| is
// size of |data| in bytes. The contents of |data| will be copied. The /// the size of |data| in bytes. The contents of |data| will be copied. The
// connection will be closed automatically after the response is sent. /// connection will be closed automatically after the response is sent.
/// ///
void(CEF_CALLBACK* send_http200response)( void(CEF_CALLBACK* send_http200response)(
struct _cef_test_server_connection_t* self, struct _cef_test_server_connection_t* self,
@ -158,28 +158,28 @@ typedef struct _cef_test_server_connection_t {
size_t data_size); size_t data_size);
/// ///
// Send an HTTP 404 "Not Found" response. The connection will be closed /// Send an HTTP 404 "Not Found" response. The connection will be closed
// automatically after the response is sent. /// automatically after the response is sent.
/// ///
void(CEF_CALLBACK* send_http404response)( void(CEF_CALLBACK* send_http404response)(
struct _cef_test_server_connection_t* self); struct _cef_test_server_connection_t* self);
/// ///
// Send an HTTP 500 "Internal Server Error" response. |error_message| is the /// Send an HTTP 500 "Internal Server Error" response. |error_message| is the
// associated error message. The connection will be closed automatically after /// associated error message. The connection will be closed automatically
// the response is sent. /// after the response is sent.
/// ///
void(CEF_CALLBACK* send_http500response)( void(CEF_CALLBACK* send_http500response)(
struct _cef_test_server_connection_t* self, struct _cef_test_server_connection_t* self,
const cef_string_t* error_message); const cef_string_t* error_message);
/// ///
// Send a custom HTTP response. |response_code| is the HTTP response code sent /// Send a custom HTTP response. |response_code| is the HTTP response code
// in the status line (e.g. 200). |content_type| is the response content type /// sent in the status line (e.g. 200). |content_type| is the response content
// (e.g. "text/html"). |data| is the response content and |data_size| is the /// type (e.g. "text/html"). |data| is the response content and |data_size| is
// size of |data| in bytes. The contents of |data| will be copied. /// the size of |data| in bytes. The contents of |data| will be copied.
// |extra_headers| is an optional map of additional header key/value pairs. /// |extra_headers| is an optional map of additional header key/value pairs.
// The connection will be closed automatically after the response is sent. /// The connection will be closed automatically after the response is sent.
/// ///
void(CEF_CALLBACK* send_http_response)( void(CEF_CALLBACK* send_http_response)(
struct _cef_test_server_connection_t* self, struct _cef_test_server_connection_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=33a684b03178472bdf93e70043304cce8bc32d05$ // $hash=58c8adb936b8dba8b13a586adfe9e32e7a02d24c$
// //
#ifndef CEF_INCLUDE_CAPI_TEST_CEF_TRANSLATOR_TEST_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_TEST_CEF_TRANSLATOR_TEST_CAPI_H_
@ -61,214 +61,206 @@ struct _cef_translator_test_scoped_library_child_t;
struct _cef_translator_test_scoped_library_t; struct _cef_translator_test_scoped_library_t;
/// ///
// Structure for testing all of the possible data transfer types. /// Structure for testing all of the possible data transfer types.
/// ///
typedef struct _cef_translator_test_t { typedef struct _cef_translator_test_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
// PRIMITIVE VALUES
/// ///
// Return a void value. /// Return a void value.
/// ///
void(CEF_CALLBACK* get_void)(struct _cef_translator_test_t* self); void(CEF_CALLBACK* get_void)(struct _cef_translator_test_t* self);
/// ///
// Return a bool value. /// Return a bool value.
/// ///
int(CEF_CALLBACK* get_bool)(struct _cef_translator_test_t* self); int(CEF_CALLBACK* get_bool)(struct _cef_translator_test_t* self);
/// ///
// Return an int value. /// Return an int value.
/// ///
int(CEF_CALLBACK* get_int)(struct _cef_translator_test_t* self); int(CEF_CALLBACK* get_int)(struct _cef_translator_test_t* self);
/// ///
// Return a double value. /// Return a double value.
/// ///
double(CEF_CALLBACK* get_double)(struct _cef_translator_test_t* self); double(CEF_CALLBACK* get_double)(struct _cef_translator_test_t* self);
/// ///
// Return a long value. /// Return a long value.
/// ///
long(CEF_CALLBACK* get_long)(struct _cef_translator_test_t* self); long(CEF_CALLBACK* get_long)(struct _cef_translator_test_t* self);
/// ///
// Return a size_t value. /// Return a size_t value.
/// ///
size_t(CEF_CALLBACK* get_sizet)(struct _cef_translator_test_t* self); size_t(CEF_CALLBACK* get_sizet)(struct _cef_translator_test_t* self);
/// ///
// Set a void value. /// Set a void value.
/// ///
int(CEF_CALLBACK* set_void)(struct _cef_translator_test_t* self); int(CEF_CALLBACK* set_void)(struct _cef_translator_test_t* self);
/// ///
// Set a bool value. /// Set a bool value.
/// ///
int(CEF_CALLBACK* set_bool)(struct _cef_translator_test_t* self, int val); int(CEF_CALLBACK* set_bool)(struct _cef_translator_test_t* self, int val);
/// ///
// Set an int value. /// Set an int value.
/// ///
int(CEF_CALLBACK* set_int)(struct _cef_translator_test_t* self, int val); int(CEF_CALLBACK* set_int)(struct _cef_translator_test_t* self, int val);
/// ///
// Set a double value. /// Set a double value.
/// ///
int(CEF_CALLBACK* set_double)(struct _cef_translator_test_t* self, int(CEF_CALLBACK* set_double)(struct _cef_translator_test_t* self,
double val); double val);
/// ///
// Set a long value. /// Set a long value.
/// ///
int(CEF_CALLBACK* set_long)(struct _cef_translator_test_t* self, long val); int(CEF_CALLBACK* set_long)(struct _cef_translator_test_t* self, long val);
/// ///
// Set a size_t value. /// Set a size_t value.
/// ///
int(CEF_CALLBACK* set_sizet)(struct _cef_translator_test_t* self, size_t val); int(CEF_CALLBACK* set_sizet)(struct _cef_translator_test_t* self, size_t val);
/// ///
// Set a int list value. /// Set a int list value.
/// ///
int(CEF_CALLBACK* set_int_list)(struct _cef_translator_test_t* self, int(CEF_CALLBACK* set_int_list)(struct _cef_translator_test_t* self,
size_t valCount, size_t valCount,
int const* val); int const* val);
/// ///
// Return an int list value by out-param. /// Return an int list value by out-param.
/// ///
int(CEF_CALLBACK* get_int_list_by_ref)(struct _cef_translator_test_t* self, int(CEF_CALLBACK* get_int_list_by_ref)(struct _cef_translator_test_t* self,
size_t* valCount, size_t* valCount,
int* val); int* val);
/// ///
// Return the number of points that will be output above. /// Return the number of points that will be output above.
/// ///
size_t(CEF_CALLBACK* get_int_list_size)(struct _cef_translator_test_t* self); size_t(CEF_CALLBACK* get_int_list_size)(struct _cef_translator_test_t* self);
// STRING VALUES
/// ///
// Return a string value. /// Return a string value.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_string)( cef_string_userfree_t(CEF_CALLBACK* get_string)(
struct _cef_translator_test_t* self); struct _cef_translator_test_t* self);
/// ///
// Set a string value. /// Set a string value.
/// ///
int(CEF_CALLBACK* set_string)(struct _cef_translator_test_t* self, int(CEF_CALLBACK* set_string)(struct _cef_translator_test_t* self,
const cef_string_t* val); const cef_string_t* val);
/// ///
// Return a string value by out-param. /// Return a string value by out-param.
/// ///
void(CEF_CALLBACK* get_string_by_ref)(struct _cef_translator_test_t* self, void(CEF_CALLBACK* get_string_by_ref)(struct _cef_translator_test_t* self,
cef_string_t* val); cef_string_t* val);
/// ///
// Set a string list value. /// Set a string list value.
/// ///
int(CEF_CALLBACK* set_string_list)(struct _cef_translator_test_t* self, int(CEF_CALLBACK* set_string_list)(struct _cef_translator_test_t* self,
cef_string_list_t val); cef_string_list_t val);
/// ///
// Return a string list value by out-param. /// Return a string list value by out-param.
/// ///
int(CEF_CALLBACK* get_string_list_by_ref)(struct _cef_translator_test_t* self, int(CEF_CALLBACK* get_string_list_by_ref)(struct _cef_translator_test_t* self,
cef_string_list_t val); cef_string_list_t val);
/// ///
// Set a string map value. /// Set a string map value.
/// ///
int(CEF_CALLBACK* set_string_map)(struct _cef_translator_test_t* self, int(CEF_CALLBACK* set_string_map)(struct _cef_translator_test_t* self,
cef_string_map_t val); cef_string_map_t val);
/// ///
// Return a string map value by out-param. /// Return a string map value by out-param.
/// ///
int(CEF_CALLBACK* get_string_map_by_ref)(struct _cef_translator_test_t* self, int(CEF_CALLBACK* get_string_map_by_ref)(struct _cef_translator_test_t* self,
cef_string_map_t val); cef_string_map_t val);
/// ///
// Set a string multimap value. /// Set a string multimap value.
/// ///
int(CEF_CALLBACK* set_string_multimap)(struct _cef_translator_test_t* self, int(CEF_CALLBACK* set_string_multimap)(struct _cef_translator_test_t* self,
cef_string_multimap_t val); cef_string_multimap_t val);
/// ///
// Return a string multimap value by out-param. /// Return a string multimap value by out-param.
/// ///
int(CEF_CALLBACK* get_string_multimap_by_ref)( int(CEF_CALLBACK* get_string_multimap_by_ref)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
cef_string_multimap_t val); cef_string_multimap_t val);
// STRUCT VALUES
/// ///
// Return a point value. /// Return a point value.
/// ///
cef_point_t(CEF_CALLBACK* get_point)(struct _cef_translator_test_t* self); cef_point_t(CEF_CALLBACK* get_point)(struct _cef_translator_test_t* self);
/// ///
// Set a point value. /// Set a point value.
/// ///
int(CEF_CALLBACK* set_point)(struct _cef_translator_test_t* self, int(CEF_CALLBACK* set_point)(struct _cef_translator_test_t* self,
const cef_point_t* val); const cef_point_t* val);
/// ///
// Return a point value by out-param. /// Return a point value by out-param.
/// ///
void(CEF_CALLBACK* get_point_by_ref)(struct _cef_translator_test_t* self, void(CEF_CALLBACK* get_point_by_ref)(struct _cef_translator_test_t* self,
cef_point_t* val); cef_point_t* val);
/// ///
// Set a point list vlaue. /// Set a point list vlaue.
/// ///
int(CEF_CALLBACK* set_point_list)(struct _cef_translator_test_t* self, int(CEF_CALLBACK* set_point_list)(struct _cef_translator_test_t* self,
size_t valCount, size_t valCount,
cef_point_t const* val); cef_point_t const* val);
/// ///
// Return a point list value by out-param. /// Return a point list value by out-param.
/// ///
int(CEF_CALLBACK* get_point_list_by_ref)(struct _cef_translator_test_t* self, int(CEF_CALLBACK* get_point_list_by_ref)(struct _cef_translator_test_t* self,
size_t* valCount, size_t* valCount,
cef_point_t* val); cef_point_t* val);
/// ///
// Return the number of points that will be output above. /// Return the number of points that will be output above.
/// ///
size_t(CEF_CALLBACK* get_point_list_size)( size_t(CEF_CALLBACK* get_point_list_size)(
struct _cef_translator_test_t* self); struct _cef_translator_test_t* self);
// LIBRARY-SIDE REFPTR VALUES
/// ///
// Return an new library-side object. /// Return an new library-side object.
/// ///
struct _cef_translator_test_ref_ptr_library_t*( struct _cef_translator_test_ref_ptr_library_t*(
CEF_CALLBACK* get_ref_ptr_library)(struct _cef_translator_test_t* self, CEF_CALLBACK* get_ref_ptr_library)(struct _cef_translator_test_t* self,
int val); int val);
/// ///
// Set an object. Returns the value from /// Set an object. Returns the value from
// cef_translator_test_ref_ptr_library_t::get_value(). This tests input and /// cef_translator_test_ref_ptr_library_t::get_value(). This tests input and
// execution of a library-side object type. /// execution of a library-side object type.
/// ///
int(CEF_CALLBACK* set_ref_ptr_library)( int(CEF_CALLBACK* set_ref_ptr_library)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
struct _cef_translator_test_ref_ptr_library_t* val); struct _cef_translator_test_ref_ptr_library_t* val);
/// ///
// Set an object. Returns the object passed in. This tests input and output of /// Set an object. Returns the object passed in. This tests input and output
// a library-side object type. /// of a library-side object type.
/// ///
struct _cef_translator_test_ref_ptr_library_t*( struct _cef_translator_test_ref_ptr_library_t*(
CEF_CALLBACK* set_ref_ptr_library_and_return)( CEF_CALLBACK* set_ref_ptr_library_and_return)(
@ -276,17 +268,17 @@ typedef struct _cef_translator_test_t {
struct _cef_translator_test_ref_ptr_library_t* val); struct _cef_translator_test_ref_ptr_library_t* val);
/// ///
// Set a child object. Returns the value from /// Set a child object. Returns the value from
// cef_translator_test_ref_ptr_library_t::get_value(). This tests input of a /// cef_translator_test_ref_ptr_library_t::get_value(). This tests input of a
// library- side child object type and execution as the parent type. /// library- side child object type and execution as the parent type.
/// ///
int(CEF_CALLBACK* set_child_ref_ptr_library)( int(CEF_CALLBACK* set_child_ref_ptr_library)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
struct _cef_translator_test_ref_ptr_library_child_t* val); struct _cef_translator_test_ref_ptr_library_child_t* val);
/// ///
// Set a child object. Returns the object as the parent type. This tests input /// Set a child object. Returns the object as the parent type. This tests
// of a library-side child object type and return as the parent type. /// input of a library-side child object type and return as the parent type.
/// ///
struct _cef_translator_test_ref_ptr_library_t*( struct _cef_translator_test_ref_ptr_library_t*(
CEF_CALLBACK* set_child_ref_ptr_library_and_return_parent)( CEF_CALLBACK* set_child_ref_ptr_library_and_return_parent)(
@ -294,7 +286,7 @@ typedef struct _cef_translator_test_t {
struct _cef_translator_test_ref_ptr_library_child_t* val); struct _cef_translator_test_ref_ptr_library_child_t* val);
/// ///
// Set an object list vlaue. /// Set an object list vlaue.
/// ///
int(CEF_CALLBACK* set_ref_ptr_library_list)( int(CEF_CALLBACK* set_ref_ptr_library_list)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
@ -304,7 +296,7 @@ typedef struct _cef_translator_test_t {
int val2); int val2);
/// ///
// Return an object list value by out-param. /// Return an object list value by out-param.
/// ///
int(CEF_CALLBACK* get_ref_ptr_library_list_by_ref)( int(CEF_CALLBACK* get_ref_ptr_library_list_by_ref)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
@ -314,25 +306,23 @@ typedef struct _cef_translator_test_t {
int val2); int val2);
/// ///
// Return the number of object that will be output above. /// Return the number of object that will be output above.
/// ///
size_t(CEF_CALLBACK* get_ref_ptr_library_list_size)( size_t(CEF_CALLBACK* get_ref_ptr_library_list_size)(
struct _cef_translator_test_t* self); struct _cef_translator_test_t* self);
// CLIENT-SIDE REFPTR VALUES
/// ///
// Set an object. Returns the value from /// Set an object. Returns the value from
// cef_translator_test_ref_ptr_client_t::get_value(). This tests input and /// cef_translator_test_ref_ptr_client_t::get_value(). This tests input and
// execution of a client-side object type. /// execution of a client-side object type.
/// ///
int(CEF_CALLBACK* set_ref_ptr_client)( int(CEF_CALLBACK* set_ref_ptr_client)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
struct _cef_translator_test_ref_ptr_client_t* val); struct _cef_translator_test_ref_ptr_client_t* val);
/// ///
// Set an object. Returns the handler passed in. This tests input and output /// Set an object. Returns the handler passed in. This tests input and output
// of a client-side object type. /// of a client-side object type.
/// ///
struct _cef_translator_test_ref_ptr_client_t*( struct _cef_translator_test_ref_ptr_client_t*(
CEF_CALLBACK* set_ref_ptr_client_and_return)( CEF_CALLBACK* set_ref_ptr_client_and_return)(
@ -340,17 +330,17 @@ typedef struct _cef_translator_test_t {
struct _cef_translator_test_ref_ptr_client_t* val); struct _cef_translator_test_ref_ptr_client_t* val);
/// ///
// Set a child object. Returns the value from /// Set a child object. Returns the value from
// cef_translator_test_ref_ptr_client_t::get_value(). This tests input of a /// cef_translator_test_ref_ptr_client_t::get_value(). This tests input of a
// client- side child object type and execution as the parent type. /// client- side child object type and execution as the parent type.
/// ///
int(CEF_CALLBACK* set_child_ref_ptr_client)( int(CEF_CALLBACK* set_child_ref_ptr_client)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
struct _cef_translator_test_ref_ptr_client_child_t* val); struct _cef_translator_test_ref_ptr_client_child_t* val);
/// ///
// Set a child object. Returns the object as the parent type. This tests input /// Set a child object. Returns the object as the parent type. This tests
// of a client-side child object type and return as the parent type. /// input of a client-side child object type and return as the parent type.
/// ///
struct _cef_translator_test_ref_ptr_client_t*( struct _cef_translator_test_ref_ptr_client_t*(
CEF_CALLBACK* set_child_ref_ptr_client_and_return_parent)( CEF_CALLBACK* set_child_ref_ptr_client_and_return_parent)(
@ -358,7 +348,7 @@ typedef struct _cef_translator_test_t {
struct _cef_translator_test_ref_ptr_client_child_t* val); struct _cef_translator_test_ref_ptr_client_child_t* val);
/// ///
// Set an object list vlaue. /// Set an object list vlaue.
/// ///
int(CEF_CALLBACK* set_ref_ptr_client_list)( int(CEF_CALLBACK* set_ref_ptr_client_list)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
@ -368,7 +358,7 @@ typedef struct _cef_translator_test_t {
int val2); int val2);
/// ///
// Return an object list value by out-param. /// Return an object list value by out-param.
/// ///
int(CEF_CALLBACK* get_ref_ptr_client_list_by_ref)( int(CEF_CALLBACK* get_ref_ptr_client_list_by_ref)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
@ -378,32 +368,30 @@ typedef struct _cef_translator_test_t {
struct _cef_translator_test_ref_ptr_client_t* val2); struct _cef_translator_test_ref_ptr_client_t* val2);
/// ///
// Return the number of object that will be output above. /// Return the number of object that will be output above.
/// ///
size_t(CEF_CALLBACK* get_ref_ptr_client_list_size)( size_t(CEF_CALLBACK* get_ref_ptr_client_list_size)(
struct _cef_translator_test_t* self); struct _cef_translator_test_t* self);
// LIBRARY-SIDE OWNPTR VALUES
/// ///
// Return an new library-side object. /// Return an new library-side object.
/// ///
struct _cef_translator_test_scoped_library_t*( struct _cef_translator_test_scoped_library_t*(
CEF_CALLBACK* get_own_ptr_library)(struct _cef_translator_test_t* self, CEF_CALLBACK* get_own_ptr_library)(struct _cef_translator_test_t* self,
int val); int val);
/// ///
// Set an object. Returns the value from /// Set an object. Returns the value from
// cef_translator_test_scoped_library_t::get_value(). This tests input and /// cef_translator_test_scoped_library_t::get_value(). This tests input and
// execution of a library-side object type. /// execution of a library-side object type.
/// ///
int(CEF_CALLBACK* set_own_ptr_library)( int(CEF_CALLBACK* set_own_ptr_library)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
struct _cef_translator_test_scoped_library_t* val); struct _cef_translator_test_scoped_library_t* val);
/// ///
// Set an object. Returns the object passed in. This tests input and output of /// Set an object. Returns the object passed in. This tests input and output
// a library-side object type. /// of a library-side object type.
/// ///
struct _cef_translator_test_scoped_library_t*( struct _cef_translator_test_scoped_library_t*(
CEF_CALLBACK* set_own_ptr_library_and_return)( CEF_CALLBACK* set_own_ptr_library_and_return)(
@ -411,37 +399,35 @@ typedef struct _cef_translator_test_t {
struct _cef_translator_test_scoped_library_t* val); struct _cef_translator_test_scoped_library_t* val);
/// ///
// Set a child object. Returns the value from /// Set a child object. Returns the value from
// cef_translator_test_scoped_library_t::get_value(). This tests input of a /// cef_translator_test_scoped_library_t::get_value(). This tests input of a
// library- side child object type and execution as the parent type. /// library- side child object type and execution as the parent type.
/// ///
int(CEF_CALLBACK* set_child_own_ptr_library)( int(CEF_CALLBACK* set_child_own_ptr_library)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
struct _cef_translator_test_scoped_library_child_t* val); struct _cef_translator_test_scoped_library_child_t* val);
/// ///
// Set a child object. Returns the object as the parent type. This tests input /// Set a child object. Returns the object as the parent type. This tests
// of a library-side child object type and return as the parent type. /// input of a library-side child object type and return as the parent type.
/// ///
struct _cef_translator_test_scoped_library_t*( struct _cef_translator_test_scoped_library_t*(
CEF_CALLBACK* set_child_own_ptr_library_and_return_parent)( CEF_CALLBACK* set_child_own_ptr_library_and_return_parent)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
struct _cef_translator_test_scoped_library_child_t* val); struct _cef_translator_test_scoped_library_child_t* val);
// CLIENT-SIDE OWNPTR VALUES
/// ///
// Set an object. Returns the value from /// Set an object. Returns the value from
// cef_translator_test_scoped_client_t::get_value(). This tests input and /// cef_translator_test_scoped_client_t::get_value(). This tests input and
// execution of a client-side object type. /// execution of a client-side object type.
/// ///
int(CEF_CALLBACK* set_own_ptr_client)( int(CEF_CALLBACK* set_own_ptr_client)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
struct _cef_translator_test_scoped_client_t* val); struct _cef_translator_test_scoped_client_t* val);
/// ///
// Set an object. Returns the handler passed in. This tests input and output /// Set an object. Returns the handler passed in. This tests input and output
// of a client-side object type. /// of a client-side object type.
/// ///
struct _cef_translator_test_scoped_client_t*( struct _cef_translator_test_scoped_client_t*(
CEF_CALLBACK* set_own_ptr_client_and_return)( CEF_CALLBACK* set_own_ptr_client_and_return)(
@ -449,45 +435,43 @@ typedef struct _cef_translator_test_t {
struct _cef_translator_test_scoped_client_t* val); struct _cef_translator_test_scoped_client_t* val);
/// ///
// Set a child object. Returns the value from /// Set a child object. Returns the value from
// cef_translator_test_scoped_client_t::get_value(). This tests input of a /// cef_translator_test_scoped_client_t::get_value(). This tests input of a
// client- side child object type and execution as the parent type. /// client- side child object type and execution as the parent type.
/// ///
int(CEF_CALLBACK* set_child_own_ptr_client)( int(CEF_CALLBACK* set_child_own_ptr_client)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
struct _cef_translator_test_scoped_client_child_t* val); struct _cef_translator_test_scoped_client_child_t* val);
/// ///
// Set a child object. Returns the object as the parent type. This tests input /// Set a child object. Returns the object as the parent type. This tests
// of a client-side child object type and return as the parent type. /// input of a client-side child object type and return as the parent type.
/// ///
struct _cef_translator_test_scoped_client_t*( struct _cef_translator_test_scoped_client_t*(
CEF_CALLBACK* set_child_own_ptr_client_and_return_parent)( CEF_CALLBACK* set_child_own_ptr_client_and_return_parent)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
struct _cef_translator_test_scoped_client_child_t* val); struct _cef_translator_test_scoped_client_child_t* val);
// LIBRARY-SIDE RAWPTR VALUES
/// ///
// Set an object. Returns the value from /// Set an object. Returns the value from
// cef_translator_test_scoped_library_t::get_value(). This tests input and /// cef_translator_test_scoped_library_t::get_value(). This tests input and
// execution of a library-side object type. /// execution of a library-side object type.
/// ///
int(CEF_CALLBACK* set_raw_ptr_library)( int(CEF_CALLBACK* set_raw_ptr_library)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
struct _cef_translator_test_scoped_library_t* val); struct _cef_translator_test_scoped_library_t* val);
/// ///
// Set a child object. Returns the value from /// Set a child object. Returns the value from
// cef_translator_test_scoped_library_t::get_value(). This tests input of a /// cef_translator_test_scoped_library_t::get_value(). This tests input of a
// library- side child object type and execution as the parent type. /// library- side child object type and execution as the parent type.
/// ///
int(CEF_CALLBACK* set_child_raw_ptr_library)( int(CEF_CALLBACK* set_child_raw_ptr_library)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
struct _cef_translator_test_scoped_library_child_t* val); struct _cef_translator_test_scoped_library_child_t* val);
/// ///
// Set an object list vlaue. /// Set an object list vlaue.
/// ///
int(CEF_CALLBACK* set_raw_ptr_library_list)( int(CEF_CALLBACK* set_raw_ptr_library_list)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
@ -496,28 +480,26 @@ typedef struct _cef_translator_test_t {
int val1, int val1,
int val2); int val2);
// CLIENT-SIDE RAWPTR VALUES
/// ///
// Set an object. Returns the value from /// Set an object. Returns the value from
// cef_translator_test_scoped_client_t::get_value(). This tests input and /// cef_translator_test_scoped_client_t::get_value(). This tests input and
// execution of a client-side object type. /// execution of a client-side object type.
/// ///
int(CEF_CALLBACK* set_raw_ptr_client)( int(CEF_CALLBACK* set_raw_ptr_client)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
struct _cef_translator_test_scoped_client_t* val); struct _cef_translator_test_scoped_client_t* val);
/// ///
// Set a child object. Returns the value from /// Set a child object. Returns the value from
// cef_translator_test_scoped_client_t::get_value(). This tests input of a /// cef_translator_test_scoped_client_t::get_value(). This tests input of a
// client- side child object type and execution as the parent type. /// client- side child object type and execution as the parent type.
/// ///
int(CEF_CALLBACK* set_child_raw_ptr_client)( int(CEF_CALLBACK* set_child_raw_ptr_client)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
struct _cef_translator_test_scoped_client_child_t* val); struct _cef_translator_test_scoped_client_child_t* val);
/// ///
// Set an object list vlaue. /// Set an object list vlaue.
/// ///
int(CEF_CALLBACK* set_raw_ptr_client_list)( int(CEF_CALLBACK* set_raw_ptr_client_list)(
struct _cef_translator_test_t* self, struct _cef_translator_test_t* self,
@ -528,27 +510,27 @@ typedef struct _cef_translator_test_t {
} cef_translator_test_t; } cef_translator_test_t;
/// ///
// Create the test object. /// Create the test object.
/// ///
CEF_EXPORT cef_translator_test_t* cef_translator_test_create(void); CEF_EXPORT cef_translator_test_t* cef_translator_test_create(void);
/// ///
// Library-side test object for RefPtr. /// Library-side test object for RefPtr.
/// ///
typedef struct _cef_translator_test_ref_ptr_library_t { typedef struct _cef_translator_test_ref_ptr_library_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Return a value. /// Return a value.
/// ///
int(CEF_CALLBACK* get_value)( int(CEF_CALLBACK* get_value)(
struct _cef_translator_test_ref_ptr_library_t* self); struct _cef_translator_test_ref_ptr_library_t* self);
/// ///
// Set a value. /// Set a value.
/// ///
void(CEF_CALLBACK* set_value)( void(CEF_CALLBACK* set_value)(
struct _cef_translator_test_ref_ptr_library_t* self, struct _cef_translator_test_ref_ptr_library_t* self,
@ -556,28 +538,28 @@ typedef struct _cef_translator_test_ref_ptr_library_t {
} cef_translator_test_ref_ptr_library_t; } cef_translator_test_ref_ptr_library_t;
/// ///
// Create the test object. /// Create the test object.
/// ///
CEF_EXPORT cef_translator_test_ref_ptr_library_t* CEF_EXPORT cef_translator_test_ref_ptr_library_t*
cef_translator_test_ref_ptr_library_create(int value); cef_translator_test_ref_ptr_library_create(int value);
/// ///
// Library-side child test object for RefPtr. /// Library-side child test object for RefPtr.
/// ///
typedef struct _cef_translator_test_ref_ptr_library_child_t { typedef struct _cef_translator_test_ref_ptr_library_child_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_translator_test_ref_ptr_library_t base; cef_translator_test_ref_ptr_library_t base;
/// ///
// Return a value. /// Return a value.
/// ///
int(CEF_CALLBACK* get_other_value)( int(CEF_CALLBACK* get_other_value)(
struct _cef_translator_test_ref_ptr_library_child_t* self); struct _cef_translator_test_ref_ptr_library_child_t* self);
/// ///
// Set a value. /// Set a value.
/// ///
void(CEF_CALLBACK* set_other_value)( void(CEF_CALLBACK* set_other_value)(
struct _cef_translator_test_ref_ptr_library_child_t* self, struct _cef_translator_test_ref_ptr_library_child_t* self,
@ -585,28 +567,28 @@ typedef struct _cef_translator_test_ref_ptr_library_child_t {
} cef_translator_test_ref_ptr_library_child_t; } cef_translator_test_ref_ptr_library_child_t;
/// ///
// Create the test object. /// Create the test object.
/// ///
CEF_EXPORT cef_translator_test_ref_ptr_library_child_t* CEF_EXPORT cef_translator_test_ref_ptr_library_child_t*
cef_translator_test_ref_ptr_library_child_create(int value, int other_value); cef_translator_test_ref_ptr_library_child_create(int value, int other_value);
/// ///
// Another library-side child test object for RefPtr. /// Another library-side child test object for RefPtr.
/// ///
typedef struct _cef_translator_test_ref_ptr_library_child_child_t { typedef struct _cef_translator_test_ref_ptr_library_child_child_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_translator_test_ref_ptr_library_child_t base; cef_translator_test_ref_ptr_library_child_t base;
/// ///
// Return a value. /// Return a value.
/// ///
int(CEF_CALLBACK* get_other_other_value)( int(CEF_CALLBACK* get_other_other_value)(
struct _cef_translator_test_ref_ptr_library_child_child_t* self); struct _cef_translator_test_ref_ptr_library_child_child_t* self);
/// ///
// Set a value. /// Set a value.
/// ///
void(CEF_CALLBACK* set_other_other_value)( void(CEF_CALLBACK* set_other_other_value)(
struct _cef_translator_test_ref_ptr_library_child_child_t* self, struct _cef_translator_test_ref_ptr_library_child_child_t* self,
@ -614,7 +596,7 @@ typedef struct _cef_translator_test_ref_ptr_library_child_child_t {
} cef_translator_test_ref_ptr_library_child_child_t; } cef_translator_test_ref_ptr_library_child_child_t;
/// ///
// Create the test object. /// Create the test object.
/// ///
CEF_EXPORT cef_translator_test_ref_ptr_library_child_child_t* CEF_EXPORT cef_translator_test_ref_ptr_library_child_child_t*
cef_translator_test_ref_ptr_library_child_child_create(int value, cef_translator_test_ref_ptr_library_child_child_create(int value,
@ -622,54 +604,54 @@ cef_translator_test_ref_ptr_library_child_child_create(int value,
int other_other_value); int other_other_value);
/// ///
// Client-side test object for RefPtr. /// Client-side test object for RefPtr.
/// ///
typedef struct _cef_translator_test_ref_ptr_client_t { typedef struct _cef_translator_test_ref_ptr_client_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Return a value. /// Return a value.
/// ///
int(CEF_CALLBACK* get_value)( int(CEF_CALLBACK* get_value)(
struct _cef_translator_test_ref_ptr_client_t* self); struct _cef_translator_test_ref_ptr_client_t* self);
} cef_translator_test_ref_ptr_client_t; } cef_translator_test_ref_ptr_client_t;
/// ///
// Client-side child test object for RefPtr. /// Client-side child test object for RefPtr.
/// ///
typedef struct _cef_translator_test_ref_ptr_client_child_t { typedef struct _cef_translator_test_ref_ptr_client_child_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_translator_test_ref_ptr_client_t base; cef_translator_test_ref_ptr_client_t base;
/// ///
// Return a value. /// Return a value.
/// ///
int(CEF_CALLBACK* get_other_value)( int(CEF_CALLBACK* get_other_value)(
struct _cef_translator_test_ref_ptr_client_child_t* self); struct _cef_translator_test_ref_ptr_client_child_t* self);
} cef_translator_test_ref_ptr_client_child_t; } cef_translator_test_ref_ptr_client_child_t;
/// ///
// Library-side test object for OwnPtr/RawPtr. /// Library-side test object for OwnPtr/RawPtr.
/// ///
typedef struct _cef_translator_test_scoped_library_t { typedef struct _cef_translator_test_scoped_library_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_scoped_t base; cef_base_scoped_t base;
/// ///
// Return a value. /// Return a value.
/// ///
int(CEF_CALLBACK* get_value)( int(CEF_CALLBACK* get_value)(
struct _cef_translator_test_scoped_library_t* self); struct _cef_translator_test_scoped_library_t* self);
/// ///
// Set a value. /// Set a value.
/// ///
void(CEF_CALLBACK* set_value)( void(CEF_CALLBACK* set_value)(
struct _cef_translator_test_scoped_library_t* self, struct _cef_translator_test_scoped_library_t* self,
@ -677,28 +659,28 @@ typedef struct _cef_translator_test_scoped_library_t {
} cef_translator_test_scoped_library_t; } cef_translator_test_scoped_library_t;
/// ///
// Create the test object. /// Create the test object.
/// ///
CEF_EXPORT cef_translator_test_scoped_library_t* CEF_EXPORT cef_translator_test_scoped_library_t*
cef_translator_test_scoped_library_create(int value); cef_translator_test_scoped_library_create(int value);
/// ///
// Library-side child test object for OwnPtr/RawPtr. /// Library-side child test object for OwnPtr/RawPtr.
/// ///
typedef struct _cef_translator_test_scoped_library_child_t { typedef struct _cef_translator_test_scoped_library_child_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_translator_test_scoped_library_t base; cef_translator_test_scoped_library_t base;
/// ///
// Return a value. /// Return a value.
/// ///
int(CEF_CALLBACK* get_other_value)( int(CEF_CALLBACK* get_other_value)(
struct _cef_translator_test_scoped_library_child_t* self); struct _cef_translator_test_scoped_library_child_t* self);
/// ///
// Set a value. /// Set a value.
/// ///
void(CEF_CALLBACK* set_other_value)( void(CEF_CALLBACK* set_other_value)(
struct _cef_translator_test_scoped_library_child_t* self, struct _cef_translator_test_scoped_library_child_t* self,
@ -706,28 +688,28 @@ typedef struct _cef_translator_test_scoped_library_child_t {
} cef_translator_test_scoped_library_child_t; } cef_translator_test_scoped_library_child_t;
/// ///
// Create the test object. /// Create the test object.
/// ///
CEF_EXPORT cef_translator_test_scoped_library_child_t* CEF_EXPORT cef_translator_test_scoped_library_child_t*
cef_translator_test_scoped_library_child_create(int value, int other_value); cef_translator_test_scoped_library_child_create(int value, int other_value);
/// ///
// Another library-side child test object for OwnPtr/RawPtr. /// Another library-side child test object for OwnPtr/RawPtr.
/// ///
typedef struct _cef_translator_test_scoped_library_child_child_t { typedef struct _cef_translator_test_scoped_library_child_child_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_translator_test_scoped_library_child_t base; cef_translator_test_scoped_library_child_t base;
/// ///
// Return a value. /// Return a value.
/// ///
int(CEF_CALLBACK* get_other_other_value)( int(CEF_CALLBACK* get_other_other_value)(
struct _cef_translator_test_scoped_library_child_child_t* self); struct _cef_translator_test_scoped_library_child_child_t* self);
/// ///
// Set a value. /// Set a value.
/// ///
void(CEF_CALLBACK* set_other_other_value)( void(CEF_CALLBACK* set_other_other_value)(
struct _cef_translator_test_scoped_library_child_child_t* self, struct _cef_translator_test_scoped_library_child_child_t* self,
@ -735,7 +717,7 @@ typedef struct _cef_translator_test_scoped_library_child_child_t {
} cef_translator_test_scoped_library_child_child_t; } cef_translator_test_scoped_library_child_child_t;
/// ///
// Create the test object. /// Create the test object.
/// ///
CEF_EXPORT cef_translator_test_scoped_library_child_child_t* CEF_EXPORT cef_translator_test_scoped_library_child_child_t*
cef_translator_test_scoped_library_child_child_create(int value, cef_translator_test_scoped_library_child_child_create(int value,
@ -743,32 +725,32 @@ cef_translator_test_scoped_library_child_child_create(int value,
int other_other_value); int other_other_value);
/// ///
// Client-side test object for OwnPtr/RawPtr. /// Client-side test object for OwnPtr/RawPtr.
/// ///
typedef struct _cef_translator_test_scoped_client_t { typedef struct _cef_translator_test_scoped_client_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_scoped_t base; cef_base_scoped_t base;
/// ///
// Return a value. /// Return a value.
/// ///
int(CEF_CALLBACK* get_value)( int(CEF_CALLBACK* get_value)(
struct _cef_translator_test_scoped_client_t* self); struct _cef_translator_test_scoped_client_t* self);
} cef_translator_test_scoped_client_t; } cef_translator_test_scoped_client_t;
/// ///
// Client-side child test object for OwnPtr/RawPtr. /// Client-side child test object for OwnPtr/RawPtr.
/// ///
typedef struct _cef_translator_test_scoped_client_child_t { typedef struct _cef_translator_test_scoped_client_child_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_translator_test_scoped_client_t base; cef_translator_test_scoped_client_t base;
/// ///
// Return a value. /// Return a value.
/// ///
int(CEF_CALLBACK* get_other_value)( int(CEF_CALLBACK* get_other_value)(
struct _cef_translator_test_scoped_client_child_t* self); struct _cef_translator_test_scoped_client_child_t* self);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=bf1d1dc95fa2053645a348d6f554688b9d06c83a$ // $hash=fe404a2a9d429c6de2a00a8e27efe553e93e792d$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BOX_LAYOUT_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BOX_LAYOUT_CAPI_H_
@ -49,33 +49,33 @@ extern "C" {
struct _cef_view_t; struct _cef_view_t;
/// ///
// A Layout manager that arranges child views vertically or horizontally in a /// A Layout manager that arranges child views vertically or horizontally in a
// side-by-side fashion with spacing around and between the child views. The /// side-by-side fashion with spacing around and between the child views. The
// child views are always sized according to their preferred size. If the host's /// child views are always sized according to their preferred size. If the
// bounds provide insufficient space, child views will be clamped. Excess space /// host's bounds provide insufficient space, child views will be clamped.
// will not be distributed. Methods must be called on the browser process UI /// Excess space will not be distributed. Methods must be called on the browser
// thread unless otherwise indicated. /// process UI thread unless otherwise indicated.
/// ///
typedef struct _cef_box_layout_t { typedef struct _cef_box_layout_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_layout_t base; cef_layout_t base;
/// ///
// Set the flex weight for the given |view|. Using the preferred size as the /// Set the flex weight for the given |view|. Using the preferred size as the
// basis, free space along the main axis is distributed to views in the ratio /// basis, free space along the main axis is distributed to views in the ratio
// of their flex weights. Similarly, if the views will overflow the parent, /// of their flex weights. Similarly, if the views will overflow the parent,
// space is subtracted in these ratios. A flex of 0 means this view is not /// space is subtracted in these ratios. A flex of 0 means this view is not
// resized. Flex values must not be negative. /// resized. Flex values must not be negative.
/// ///
void(CEF_CALLBACK* set_flex_for_view)(struct _cef_box_layout_t* self, void(CEF_CALLBACK* set_flex_for_view)(struct _cef_box_layout_t* self,
struct _cef_view_t* view, struct _cef_view_t* view,
int flex); int flex);
/// ///
// Clears the flex for the given |view|, causing it to use the default flex /// Clears the flex for the given |view|, causing it to use the default flex
// specified via cef_box_layout_tSettings.default_flex. /// specified via cef_box_layout_tSettings.default_flex.
/// ///
void(CEF_CALLBACK* clear_flex_for_view)(struct _cef_box_layout_t* self, void(CEF_CALLBACK* clear_flex_for_view)(struct _cef_box_layout_t* self,
struct _cef_view_t* view); struct _cef_view_t* view);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=9ae10b92eed7495112c94825521ac46fb9327ef7$ // $hash=f575718f8c4df556ba92a2aff7204cbd6ad87bd6$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BROWSER_VIEW_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BROWSER_VIEW_CAPI_H_
@ -49,52 +49,52 @@ extern "C" {
#endif #endif
/// ///
// A View hosting a cef_browser_t instance. Methods must be called on the /// A View hosting a cef_browser_t instance. Methods must be called on the
// browser process UI thread unless otherwise indicated. /// browser process UI thread unless otherwise indicated.
/// ///
typedef struct _cef_browser_view_t { typedef struct _cef_browser_view_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_view_t base; cef_view_t base;
/// ///
// Returns the cef_browser_t hosted by this BrowserView. Will return NULL if /// Returns the cef_browser_t hosted by this BrowserView. Will return NULL if
// the browser has not yet been created or has already been destroyed. /// the browser has not yet been created or has already been destroyed.
/// ///
struct _cef_browser_t*(CEF_CALLBACK* get_browser)( struct _cef_browser_t*(CEF_CALLBACK* get_browser)(
struct _cef_browser_view_t* self); struct _cef_browser_view_t* self);
/// ///
// Returns the Chrome toolbar associated with this BrowserView. Only supported /// Returns the Chrome toolbar associated with this BrowserView. Only
// when using the Chrome runtime. The cef_browser_view_delegate_t:: /// supported when using the Chrome runtime. The cef_browser_view_delegate_t::
// get_chrome_toolbar_type() function must return a value other than /// get_chrome_toolbar_type() function must return a value other than
// CEF_CTT_NONE and the toolbar will not be available until after this /// CEF_CTT_NONE and the toolbar will not be available until after this
// BrowserView is added to a cef_window_t and /// BrowserView is added to a cef_window_t and
// cef_view_delegate_t::on_window_changed() has been called. /// cef_view_delegate_t::on_window_changed() has been called.
/// ///
struct _cef_view_t*(CEF_CALLBACK* get_chrome_toolbar)( struct _cef_view_t*(CEF_CALLBACK* get_chrome_toolbar)(
struct _cef_browser_view_t* self); struct _cef_browser_view_t* self);
/// ///
// Sets whether accelerators registered with cef_window_t::SetAccelerator are /// Sets whether accelerators registered with cef_window_t::SetAccelerator are
// triggered before or after the event is sent to the cef_browser_t. If /// triggered before or after the event is sent to the cef_browser_t. If
// |prefer_accelerators| is true (1) then the matching accelerator will be /// |prefer_accelerators| is true (1) then the matching accelerator will be
// triggered immediately and the event will not be sent to the cef_browser_t. /// triggered immediately and the event will not be sent to the cef_browser_t.
// If |prefer_accelerators| is false (0) then the matching accelerator will /// If |prefer_accelerators| is false (0) then the matching accelerator will
// only be triggered if the event is not handled by web content or by /// only be triggered if the event is not handled by web content or by
// cef_keyboard_handler_t. The default value is false (0). /// cef_keyboard_handler_t. The default value is false (0).
/// ///
void(CEF_CALLBACK* set_prefer_accelerators)(struct _cef_browser_view_t* self, void(CEF_CALLBACK* set_prefer_accelerators)(struct _cef_browser_view_t* self,
int prefer_accelerators); int prefer_accelerators);
} cef_browser_view_t; } cef_browser_view_t;
/// ///
// Create a new BrowserView. The underlying cef_browser_t will not be created /// Create a new BrowserView. The underlying cef_browser_t will not be created
// until this view is added to the views hierarchy. The optional |extra_info| /// until this view is added to the views hierarchy. The optional |extra_info|
// parameter provides an opportunity to specify extra information specific to /// parameter provides an opportunity to specify extra information specific to
// the created browser that will be passed to /// the created browser that will be passed to
// cef_render_process_handler_t::on_browser_created() in the render process. /// cef_render_process_handler_t::on_browser_created() in the render process.
/// ///
CEF_EXPORT cef_browser_view_t* cef_browser_view_create( CEF_EXPORT cef_browser_view_t* cef_browser_view_create(
struct _cef_client_t* client, struct _cef_client_t* client,
@ -105,7 +105,7 @@ CEF_EXPORT cef_browser_view_t* cef_browser_view_create(
struct _cef_browser_view_delegate_t* delegate); struct _cef_browser_view_delegate_t* delegate);
/// ///
// Returns the BrowserView associated with |browser|. /// Returns the BrowserView associated with |browser|.
/// ///
CEF_EXPORT cef_browser_view_t* cef_browser_view_get_for_browser( CEF_EXPORT cef_browser_view_t* cef_browser_view_get_for_browser(
struct _cef_browser_t* browser); struct _cef_browser_t* browser);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=520df1f3e00efbffc9d499149f2f797bf0f85c99$ // $hash=0e7953aa553f6987fa0142a9c4848ca59d68fb69$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BROWSER_VIEW_DELEGATE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BROWSER_VIEW_DELEGATE_CAPI_H_
@ -51,21 +51,21 @@ struct _cef_browser_t;
struct _cef_browser_view_t; struct _cef_browser_view_t;
/// ///
// Implement this structure to handle BrowserView events. The functions of this /// Implement this structure to handle BrowserView events. The functions of this
// structure will be called on the browser process UI thread unless otherwise /// structure will be called on the browser process UI thread unless otherwise
// indicated. /// indicated.
/// ///
typedef struct _cef_browser_view_delegate_t { typedef struct _cef_browser_view_delegate_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_view_delegate_t base; cef_view_delegate_t base;
/// ///
// Called when |browser| associated with |browser_view| is created. This /// Called when |browser| associated with |browser_view| is created. This
// function will be called after cef_life_span_handler_t::on_after_created() /// function will be called after cef_life_span_handler_t::on_after_created()
// is called for |browser| and before on_popup_browser_view_created() is /// is called for |browser| and before on_popup_browser_view_created() is
// called for |browser|'s parent delegate if |browser| is a popup. /// called for |browser|'s parent delegate if |browser| is a popup.
/// ///
void(CEF_CALLBACK* on_browser_created)( void(CEF_CALLBACK* on_browser_created)(
struct _cef_browser_view_delegate_t* self, struct _cef_browser_view_delegate_t* self,
@ -73,10 +73,10 @@ typedef struct _cef_browser_view_delegate_t {
struct _cef_browser_t* browser); struct _cef_browser_t* browser);
/// ///
// Called when |browser| associated with |browser_view| is destroyed. Release /// Called when |browser| associated with |browser_view| is destroyed. Release
// all references to |browser| and do not attempt to execute any functions on /// all references to |browser| and do not attempt to execute any functions on
// |browser| after this callback returns. This function will be called before /// |browser| after this callback returns. This function will be called before
// cef_life_span_handler_t::on_before_close() is called for |browser|. /// cef_life_span_handler_t::on_before_close() is called for |browser|.
/// ///
void(CEF_CALLBACK* on_browser_destroyed)( void(CEF_CALLBACK* on_browser_destroyed)(
struct _cef_browser_view_delegate_t* self, struct _cef_browser_view_delegate_t* self,
@ -84,11 +84,11 @@ typedef struct _cef_browser_view_delegate_t {
struct _cef_browser_t* browser); struct _cef_browser_t* browser);
/// ///
// Called before a new popup BrowserView is created. The popup originated from /// Called before a new popup BrowserView is created. The popup originated
// |browser_view|. |settings| and |client| are the values returned from /// from |browser_view|. |settings| and |client| are the values returned from
// cef_life_span_handler_t::on_before_popup(). |is_devtools| will be true (1) /// cef_life_span_handler_t::on_before_popup(). |is_devtools| will be true (1)
// if the popup will be a DevTools browser. Return the delegate that will be /// if the popup will be a DevTools browser. Return the delegate that will be
// used for the new popup BrowserView. /// used for the new popup BrowserView.
/// ///
struct _cef_browser_view_delegate_t*( struct _cef_browser_view_delegate_t*(
CEF_CALLBACK* get_delegate_for_popup_browser_view)( CEF_CALLBACK* get_delegate_for_popup_browser_view)(
@ -99,13 +99,13 @@ typedef struct _cef_browser_view_delegate_t {
int is_devtools); int is_devtools);
/// ///
// Called after |popup_browser_view| is created. This function will be called /// Called after |popup_browser_view| is created. This function will be called
// after cef_life_span_handler_t::on_after_created() and on_browser_created() /// after cef_life_span_handler_t::on_after_created() and on_browser_created()
// are called for the new popup browser. The popup originated from /// are called for the new popup browser. The popup originated from
// |browser_view|. |is_devtools| will be true (1) if the popup is a DevTools /// |browser_view|. |is_devtools| will be true (1) if the popup is a DevTools
// browser. Optionally add |popup_browser_view| to the views hierarchy /// browser. Optionally add |popup_browser_view| to the views hierarchy
// yourself and return true (1). Otherwise return false (0) and a default /// yourself and return true (1). Otherwise return false (0) and a default
// cef_window_t will be created for the popup. /// cef_window_t will be created for the popup.
/// ///
int(CEF_CALLBACK* on_popup_browser_view_created)( int(CEF_CALLBACK* on_popup_browser_view_created)(
struct _cef_browser_view_delegate_t* self, struct _cef_browser_view_delegate_t* self,
@ -114,9 +114,9 @@ typedef struct _cef_browser_view_delegate_t {
int is_devtools); int is_devtools);
/// ///
// Returns the Chrome toolbar type that will be available via /// Returns the Chrome toolbar type that will be available via
// cef_browser_view_t::get_chrome_toolbar(). See that function for related /// cef_browser_view_t::get_chrome_toolbar(). See that function for related
// documentation. /// documentation.
/// ///
cef_chrome_toolbar_type_t(CEF_CALLBACK* get_chrome_toolbar_type)( cef_chrome_toolbar_type_t(CEF_CALLBACK* get_chrome_toolbar_type)(
struct _cef_browser_view_delegate_t* self); struct _cef_browser_view_delegate_t* self);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=5ebbf84a506d3d4d0bfb3d8db48f060a682f1ac9$ // $hash=6eb1f513763884af55e28aaf1c13b67240d15b33$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BUTTON_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BUTTON_CAPI_H_
@ -49,48 +49,49 @@ extern "C" {
struct _cef_label_button_t; struct _cef_label_button_t;
/// ///
// A View representing a button. Depending on the specific type, the button /// A View representing a button. Depending on the specific type, the button
// could be implemented by a native control or custom rendered. Methods must be /// could be implemented by a native control or custom rendered. Methods must be
// called on the browser process UI thread unless otherwise indicated. /// called on the browser process UI thread unless otherwise indicated.
/// ///
typedef struct _cef_button_t { typedef struct _cef_button_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_view_t base; cef_view_t base;
/// ///
// Returns this Button as a LabelButton or NULL if this is not a LabelButton. /// Returns this Button as a LabelButton or NULL if this is not a LabelButton.
/// ///
struct _cef_label_button_t*(CEF_CALLBACK* as_label_button)( struct _cef_label_button_t*(CEF_CALLBACK* as_label_button)(
struct _cef_button_t* self); struct _cef_button_t* self);
/// ///
// Sets the current display state of the Button. /// Sets the current display state of the Button.
/// ///
void(CEF_CALLBACK* set_state)(struct _cef_button_t* self, void(CEF_CALLBACK* set_state)(struct _cef_button_t* self,
cef_button_state_t state); cef_button_state_t state);
/// ///
// Returns the current display state of the Button. /// Returns the current display state of the Button.
/// ///
cef_button_state_t(CEF_CALLBACK* get_state)(struct _cef_button_t* self); cef_button_state_t(CEF_CALLBACK* get_state)(struct _cef_button_t* self);
/// ///
// Sets the Button will use an ink drop effect for displaying state changes. /// Sets the Button will use an ink drop effect for displaying state changes.
/// ///
void(CEF_CALLBACK* set_ink_drop_enabled)(struct _cef_button_t* self, void(CEF_CALLBACK* set_ink_drop_enabled)(struct _cef_button_t* self,
int enabled); int enabled);
/// ///
// Sets the tooltip text that will be displayed when the user hovers the mouse /// Sets the tooltip text that will be displayed when the user hovers the
// cursor over the Button. /// mouse cursor over the Button.
/// ///
void(CEF_CALLBACK* set_tooltip_text)(struct _cef_button_t* self, void(CEF_CALLBACK* set_tooltip_text)(struct _cef_button_t* self,
const cef_string_t* tooltip_text); const cef_string_t* tooltip_text);
/// ///
// Sets the accessible name that will be exposed to assistive technology (AT). /// Sets the accessible name that will be exposed to assistive technology
/// (AT).
/// ///
void(CEF_CALLBACK* set_accessible_name)(struct _cef_button_t* self, void(CEF_CALLBACK* set_accessible_name)(struct _cef_button_t* self,
const cef_string_t* name); const cef_string_t* name);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=9f1752ee949e98662a718de764e83f26ce06ec26$ // $hash=a5faae9e35df9935393dbf1db5df832f8b9a025c$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BUTTON_DELEGATE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BUTTON_DELEGATE_CAPI_H_
@ -49,24 +49,24 @@ extern "C" {
struct _cef_button_t; struct _cef_button_t;
/// ///
// Implement this structure to handle Button events. The functions of this /// Implement this structure to handle Button events. The functions of this
// structure will be called on the browser process UI thread unless otherwise /// structure will be called on the browser process UI thread unless otherwise
// indicated. /// indicated.
/// ///
typedef struct _cef_button_delegate_t { typedef struct _cef_button_delegate_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_view_delegate_t base; cef_view_delegate_t base;
/// ///
// Called when |button| is pressed. /// Called when |button| is pressed.
/// ///
void(CEF_CALLBACK* on_button_pressed)(struct _cef_button_delegate_t* self, void(CEF_CALLBACK* on_button_pressed)(struct _cef_button_delegate_t* self,
struct _cef_button_t* button); struct _cef_button_t* button);
/// ///
// Called when the state of |button| changes. /// Called when the state of |button| changes.
/// ///
void(CEF_CALLBACK* on_button_state_changed)( void(CEF_CALLBACK* on_button_state_changed)(
struct _cef_button_delegate_t* self, struct _cef_button_delegate_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=5e383d792ce9dc1809d3d3fdeabb9c60fb9ff1ba$ // $hash=3ff71283b14972df89a3c4c7c698faf887cef6d0$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_DISPLAY_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_DISPLAY_CAPI_H_
@ -47,95 +47,95 @@ extern "C" {
#endif #endif
/// ///
// This structure typically, but not always, corresponds to a physical display /// This structure typically, but not always, corresponds to a physical display
// connected to the system. A fake Display may exist on a headless system, or a /// connected to the system. A fake Display may exist on a headless system, or a
// Display may correspond to a remote, virtual display. All size and position /// Display may correspond to a remote, virtual display. All size and position
// values are in density independent pixel (DIP) coordinates unless otherwise /// values are in density independent pixel (DIP) coordinates unless otherwise
// indicated. Methods must be called on the browser process UI thread unless /// indicated. Methods must be called on the browser process UI thread unless
// otherwise indicated. /// otherwise indicated.
/// ///
typedef struct _cef_display_t { typedef struct _cef_display_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns the unique identifier for this Display. /// Returns the unique identifier for this Display.
/// ///
int64(CEF_CALLBACK* get_id)(struct _cef_display_t* self); int64(CEF_CALLBACK* get_id)(struct _cef_display_t* self);
/// ///
// Returns this Display's device pixel scale factor. This specifies how much /// Returns this Display's device pixel scale factor. This specifies how much
// the UI should be scaled when the actual output has more pixels than /// the UI should be scaled when the actual output has more pixels than
// standard displays (which is around 100~120dpi). The potential return values /// standard displays (which is around 100~120dpi). The potential return
// differ by platform. /// values differ by platform.
/// ///
float(CEF_CALLBACK* get_device_scale_factor)(struct _cef_display_t* self); float(CEF_CALLBACK* get_device_scale_factor)(struct _cef_display_t* self);
/// ///
// Convert |point| from DIP coordinates to pixel coordinates using this /// Convert |point| from DIP coordinates to pixel coordinates using this
// Display's device scale factor. /// Display's device scale factor.
/// ///
void(CEF_CALLBACK* convert_point_to_pixels)(struct _cef_display_t* self, void(CEF_CALLBACK* convert_point_to_pixels)(struct _cef_display_t* self,
cef_point_t* point); cef_point_t* point);
/// ///
// Convert |point| from pixel coordinates to DIP coordinates using this /// Convert |point| from pixel coordinates to DIP coordinates using this
// Display's device scale factor. /// Display's device scale factor.
/// ///
void(CEF_CALLBACK* convert_point_from_pixels)(struct _cef_display_t* self, void(CEF_CALLBACK* convert_point_from_pixels)(struct _cef_display_t* self,
cef_point_t* point); cef_point_t* point);
/// ///
// Returns this Display's bounds in DIP screen coordinates. This is the full /// Returns this Display's bounds in DIP screen coordinates. This is the full
// size of the display. /// size of the display.
/// ///
cef_rect_t(CEF_CALLBACK* get_bounds)(struct _cef_display_t* self); cef_rect_t(CEF_CALLBACK* get_bounds)(struct _cef_display_t* self);
/// ///
// Returns this Display's work area in DIP screen coordinates. This excludes /// Returns this Display's work area in DIP screen coordinates. This excludes
// areas of the display that are occupied with window manager toolbars, etc. /// areas of the display that are occupied with window manager toolbars, etc.
/// ///
cef_rect_t(CEF_CALLBACK* get_work_area)(struct _cef_display_t* self); cef_rect_t(CEF_CALLBACK* get_work_area)(struct _cef_display_t* self);
/// ///
// Returns this Display's rotation in degrees. /// Returns this Display's rotation in degrees.
/// ///
int(CEF_CALLBACK* get_rotation)(struct _cef_display_t* self); int(CEF_CALLBACK* get_rotation)(struct _cef_display_t* self);
} cef_display_t; } cef_display_t;
/// ///
// Returns the primary Display. /// Returns the primary Display.
/// ///
CEF_EXPORT cef_display_t* cef_display_get_primary(void); CEF_EXPORT cef_display_t* cef_display_get_primary(void);
/// ///
// Returns the Display nearest |point|. Set |input_pixel_coords| to true (1) if /// Returns the Display nearest |point|. Set |input_pixel_coords| to true (1) if
// |point| is in pixel screen coordinates instead of DIP screen coordinates. /// |point| is in pixel screen coordinates instead of DIP screen coordinates.
/// ///
CEF_EXPORT cef_display_t* cef_display_get_nearest_point( CEF_EXPORT cef_display_t* cef_display_get_nearest_point(
const cef_point_t* point, const cef_point_t* point,
int input_pixel_coords); int input_pixel_coords);
/// ///
// Returns the Display that most closely intersects |bounds|. Set /// Returns the Display that most closely intersects |bounds|. Set
// |input_pixel_coords| to true (1) if |bounds| is in pixel screen coordinates /// |input_pixel_coords| to true (1) if |bounds| is in pixel screen coordinates
// instead of DIP screen coordinates. /// instead of DIP screen coordinates.
/// ///
CEF_EXPORT cef_display_t* cef_display_get_matching_bounds( CEF_EXPORT cef_display_t* cef_display_get_matching_bounds(
const cef_rect_t* bounds, const cef_rect_t* bounds,
int input_pixel_coords); int input_pixel_coords);
/// ///
// Returns the total number of Displays. Mirrored displays are excluded; this /// Returns the total number of Displays. Mirrored displays are excluded; this
// function is intended to return the number of distinct, usable displays. /// function is intended to return the number of distinct, usable displays.
/// ///
CEF_EXPORT size_t cef_display_get_count(void); CEF_EXPORT size_t cef_display_get_count(void);
/// ///
// Returns all Displays. Mirrored displays are excluded; this function is /// Returns all Displays. Mirrored displays are excluded; this function is
// intended to return distinct, usable displays. /// intended to return distinct, usable displays.
/// ///
CEF_EXPORT void cef_display_get_alls(size_t* displaysCount, CEF_EXPORT void cef_display_get_alls(size_t* displaysCount,
cef_display_t** displays); cef_display_t** displays);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=13972453cdca328c6ee81249aeb202d80da6d290$ // $hash=dc1a43f52c873628c98a479ae69f6e24cbd58129$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_FILL_LAYOUT_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_FILL_LAYOUT_CAPI_H_
@ -47,13 +47,13 @@ extern "C" {
#endif #endif
/// ///
// A simple Layout that causes the associated Panel's one child to be sized to /// A simple Layout that causes the associated Panel's one child to be sized to
// match the bounds of its parent. Methods must be called on the browser process /// match the bounds of its parent. Methods must be called on the browser
// UI thread unless otherwise indicated. /// process UI thread unless otherwise indicated.
/// ///
typedef struct _cef_fill_layout_t { typedef struct _cef_fill_layout_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_layout_t base; cef_layout_t base;
} cef_fill_layout_t; } cef_fill_layout_t;

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=de3e738efca85a84422c92fa8504b24ed4efab8a$ // $hash=88a2e2e9e1b0e7a692aca78be34ce1620c936336$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_LABEL_BUTTON_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_LABEL_BUTTON_CAPI_H_
@ -51,104 +51,105 @@ extern "C" {
struct _cef_menu_button_t; struct _cef_menu_button_t;
/// ///
// LabelButton is a button with optional text and/or icon. Methods must be /// LabelButton is a button with optional text and/or icon. Methods must be
// called on the browser process UI thread unless otherwise indicated. /// called on the browser process UI thread unless otherwise indicated.
/// ///
typedef struct _cef_label_button_t { typedef struct _cef_label_button_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_button_t base; cef_button_t base;
/// ///
// Returns this LabelButton as a MenuButton or NULL if this is not a /// Returns this LabelButton as a MenuButton or NULL if this is not a
// MenuButton. /// MenuButton.
/// ///
struct _cef_menu_button_t*(CEF_CALLBACK* as_menu_button)( struct _cef_menu_button_t*(CEF_CALLBACK* as_menu_button)(
struct _cef_label_button_t* self); struct _cef_label_button_t* self);
/// ///
// Sets the text shown on the LabelButton. By default |text| will also be used /// Sets the text shown on the LabelButton. By default |text| will also be
// as the accessible name. /// used as the accessible name.
/// ///
void(CEF_CALLBACK* set_text)(struct _cef_label_button_t* self, void(CEF_CALLBACK* set_text)(struct _cef_label_button_t* self,
const cef_string_t* text); const cef_string_t* text);
/// ///
// Returns the text shown on the LabelButton. /// Returns the text shown on the LabelButton.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_text)( cef_string_userfree_t(CEF_CALLBACK* get_text)(
struct _cef_label_button_t* self); struct _cef_label_button_t* self);
/// ///
// Sets the image shown for |button_state|. When this Button is drawn if no /// Sets the image shown for |button_state|. When this Button is drawn if no
// image exists for the current state then the image for /// image exists for the current state then the image for
// CEF_BUTTON_STATE_NORMAL, if any, will be shown. /// CEF_BUTTON_STATE_NORMAL, if any, will be shown.
/// ///
void(CEF_CALLBACK* set_image)(struct _cef_label_button_t* self, void(CEF_CALLBACK* set_image)(struct _cef_label_button_t* self,
cef_button_state_t button_state, cef_button_state_t button_state,
struct _cef_image_t* image); struct _cef_image_t* image);
/// ///
// Returns the image shown for |button_state|. If no image exists for that /// Returns the image shown for |button_state|. If no image exists for that
// state then the image for CEF_BUTTON_STATE_NORMAL will be returned. /// state then the image for CEF_BUTTON_STATE_NORMAL will be returned.
/// ///
struct _cef_image_t*(CEF_CALLBACK* get_image)( struct _cef_image_t*(CEF_CALLBACK* get_image)(
struct _cef_label_button_t* self, struct _cef_label_button_t* self,
cef_button_state_t button_state); cef_button_state_t button_state);
/// ///
// Sets the text color shown for the specified button |for_state| to |color|. /// Sets the text color shown for the specified button |for_state| to |color|.
/// ///
void(CEF_CALLBACK* set_text_color)(struct _cef_label_button_t* self, void(CEF_CALLBACK* set_text_color)(struct _cef_label_button_t* self,
cef_button_state_t for_state, cef_button_state_t for_state,
cef_color_t color); cef_color_t color);
/// ///
// Sets the text colors shown for the non-disabled states to |color|. /// Sets the text colors shown for the non-disabled states to |color|.
/// ///
void(CEF_CALLBACK* set_enabled_text_colors)(struct _cef_label_button_t* self, void(CEF_CALLBACK* set_enabled_text_colors)(struct _cef_label_button_t* self,
cef_color_t color); cef_color_t color);
/// ///
// Sets the font list. The format is "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", /// Sets the font list. The format is "<FONT_FAMILY_LIST>,[STYLES] <SIZE>",
// where: - FONT_FAMILY_LIST is a comma-separated list of font family names, - /// where: - FONT_FAMILY_LIST is a comma-separated list of font family names,
// STYLES is an optional space-separated list of style names (case-sensitive /// - STYLES is an optional space-separated list of style names (case-
// "Bold" and "Italic" are supported), and /// sensitive
// - SIZE is an integer font size in pixels with the suffix "px". /// "Bold" and "Italic" are supported), and
// /// - SIZE is an integer font size in pixels with the suffix "px".
// Here are examples of valid font description strings: - "Arial, Helvetica, ///
// Bold Italic 14px" - "Arial, 14px" /// Here are examples of valid font description strings: - "Arial, Helvetica,
/// Bold Italic 14px" - "Arial, 14px"
/// ///
void(CEF_CALLBACK* set_font_list)(struct _cef_label_button_t* self, void(CEF_CALLBACK* set_font_list)(struct _cef_label_button_t* self,
const cef_string_t* font_list); const cef_string_t* font_list);
/// ///
// Sets the horizontal alignment; reversed in RTL. Default is /// Sets the horizontal alignment; reversed in RTL. Default is
// CEF_HORIZONTAL_ALIGNMENT_CENTER. /// CEF_HORIZONTAL_ALIGNMENT_CENTER.
/// ///
void(CEF_CALLBACK* set_horizontal_alignment)( void(CEF_CALLBACK* set_horizontal_alignment)(
struct _cef_label_button_t* self, struct _cef_label_button_t* self,
cef_horizontal_alignment_t alignment); cef_horizontal_alignment_t alignment);
/// ///
// Reset the minimum size of this LabelButton to |size|. /// Reset the minimum size of this LabelButton to |size|.
/// ///
void(CEF_CALLBACK* set_minimum_size)(struct _cef_label_button_t* self, void(CEF_CALLBACK* set_minimum_size)(struct _cef_label_button_t* self,
const cef_size_t* size); const cef_size_t* size);
/// ///
// Reset the maximum size of this LabelButton to |size|. /// Reset the maximum size of this LabelButton to |size|.
/// ///
void(CEF_CALLBACK* set_maximum_size)(struct _cef_label_button_t* self, void(CEF_CALLBACK* set_maximum_size)(struct _cef_label_button_t* self,
const cef_size_t* size); const cef_size_t* size);
} cef_label_button_t; } cef_label_button_t;
/// ///
// Create a new LabelButton. A |delegate| must be provided to handle the button /// Create a new LabelButton. A |delegate| must be provided to handle the button
// click. |text| will be shown on the LabelButton and used as the default /// click. |text| will be shown on the LabelButton and used as the default
// accessible name. /// accessible name.
/// ///
CEF_EXPORT cef_label_button_t* cef_label_button_create( CEF_EXPORT cef_label_button_t* cef_label_button_create(
struct _cef_button_delegate_t* delegate, struct _cef_button_delegate_t* delegate,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=6ef0d3d4390654fc1460a2ff586f2bbfd62e96b8$ // $hash=01c57abc0a004118040b58bdcec07dfd32827d4f$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_LAYOUT_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_LAYOUT_CAPI_H_
@ -50,30 +50,30 @@ struct _cef_box_layout_t;
struct _cef_fill_layout_t; struct _cef_fill_layout_t;
/// ///
// A Layout handles the sizing of the children of a Panel according to /// A Layout handles the sizing of the children of a Panel according to
// implementation-specific heuristics. Methods must be called on the browser /// implementation-specific heuristics. Methods must be called on the browser
// process UI thread unless otherwise indicated. /// process UI thread unless otherwise indicated.
/// ///
typedef struct _cef_layout_t { typedef struct _cef_layout_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns this Layout as a BoxLayout or NULL if this is not a BoxLayout. /// Returns this Layout as a BoxLayout or NULL if this is not a BoxLayout.
/// ///
struct _cef_box_layout_t*(CEF_CALLBACK* as_box_layout)( struct _cef_box_layout_t*(CEF_CALLBACK* as_box_layout)(
struct _cef_layout_t* self); struct _cef_layout_t* self);
/// ///
// Returns this Layout as a FillLayout or NULL if this is not a FillLayout. /// Returns this Layout as a FillLayout or NULL if this is not a FillLayout.
/// ///
struct _cef_fill_layout_t*(CEF_CALLBACK* as_fill_layout)( struct _cef_fill_layout_t*(CEF_CALLBACK* as_fill_layout)(
struct _cef_layout_t* self); struct _cef_layout_t* self);
/// ///
// Returns true (1) if this Layout is valid. /// Returns true (1) if this Layout is valid.
/// ///
int(CEF_CALLBACK* is_valid)(struct _cef_layout_t* self); int(CEF_CALLBACK* is_valid)(struct _cef_layout_t* self);
} cef_layout_t; } cef_layout_t;

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=925b09f77cd71327a447bf5c9601cc21a7eb7c3a$ // $hash=cfe68fb772b0c370f6895a1e8756491326de9c14$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_MENU_BUTTON_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_MENU_BUTTON_CAPI_H_
@ -49,22 +49,23 @@ extern "C" {
#endif #endif
/// ///
// MenuButton is a button with optional text, icon and/or menu marker that shows /// MenuButton is a button with optional text, icon and/or menu marker that
// a menu when clicked with the left mouse button. All size and position values /// shows a menu when clicked with the left mouse button. All size and position
// are in density independent pixels (DIP) unless otherwise indicated. Methods /// values are in density independent pixels (DIP) unless otherwise indicated.
// must be called on the browser process UI thread unless otherwise indicated. /// Methods must be called on the browser process UI thread unless otherwise
/// indicated.
/// ///
typedef struct _cef_menu_button_t { typedef struct _cef_menu_button_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_label_button_t base; cef_label_button_t base;
/// ///
// Show a menu with contents |menu_model|. |screen_point| specifies the menu /// Show a menu with contents |menu_model|. |screen_point| specifies the menu
// position in screen coordinates. |anchor_position| specifies how the menu /// position in screen coordinates. |anchor_position| specifies how the menu
// will be anchored relative to |screen_point|. This function should be called /// will be anchored relative to |screen_point|. This function should be
// from cef_menu_button_delegate_t::on_menu_button_pressed(). /// called from cef_menu_button_delegate_t::on_menu_button_pressed().
/// ///
void(CEF_CALLBACK* show_menu)(struct _cef_menu_button_t* self, void(CEF_CALLBACK* show_menu)(struct _cef_menu_button_t* self,
struct _cef_menu_model_t* menu_model, struct _cef_menu_model_t* menu_model,
@ -72,20 +73,20 @@ typedef struct _cef_menu_button_t {
cef_menu_anchor_position_t anchor_position); cef_menu_anchor_position_t anchor_position);
/// ///
// Show the menu for this button. Results in a call to /// Show the menu for this button. Results in a call to
// cef_menu_button_delegate_t::on_menu_button_pressed(). /// cef_menu_button_delegate_t::on_menu_button_pressed().
/// ///
void(CEF_CALLBACK* trigger_menu)(struct _cef_menu_button_t* self); void(CEF_CALLBACK* trigger_menu)(struct _cef_menu_button_t* self);
} cef_menu_button_t; } cef_menu_button_t;
/// ///
// Create a new MenuButton. A |delegate| must be provided to call show_menu() /// Create a new MenuButton. A |delegate| must be provided to call show_menu()
// when the button is clicked. |text| will be shown on the MenuButton and used /// when the button is clicked. |text| will be shown on the MenuButton and used
// as the default accessible name. If |with_frame| is true (1) the button will /// as the default accessible name. If |with_frame| is true (1) the button will
// have a visible frame at all times, center alignment, additional padding and a /// have a visible frame at all times, center alignment, additional padding and
// default minimum size of 70x33 DIP. If |with_frame| is false (0) the button /// a default minimum size of 70x33 DIP. If |with_frame| is false (0) the button
// will only have a visible frame on hover/press, left alignment, less padding /// will only have a visible frame on hover/press, left alignment, less padding
// and no default minimum size. /// and no default minimum size.
/// ///
CEF_EXPORT cef_menu_button_t* cef_menu_button_create( CEF_EXPORT cef_menu_button_t* cef_menu_button_create(
struct _cef_menu_button_delegate_t* delegate, struct _cef_menu_button_delegate_t* delegate,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=ca7948602a0d20a5bd0271065d79e8679898eff6$ // $hash=f52310d3f7e9a8be886161ae0e20e4b903a2e765$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_MENU_BUTTON_DELEGATE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_MENU_BUTTON_DELEGATE_CAPI_H_
@ -49,31 +49,31 @@ extern "C" {
struct _cef_menu_button_t; struct _cef_menu_button_t;
/// ///
// MenuButton pressed lock is released when this object is destroyed. /// MenuButton pressed lock is released when this object is destroyed.
/// ///
typedef struct _cef_menu_button_pressed_lock_t { typedef struct _cef_menu_button_pressed_lock_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
} cef_menu_button_pressed_lock_t; } cef_menu_button_pressed_lock_t;
/// ///
// Implement this structure to handle MenuButton events. The functions of this /// Implement this structure to handle MenuButton events. The functions of this
// structure will be called on the browser process UI thread unless otherwise /// structure will be called on the browser process UI thread unless otherwise
// indicated. /// indicated.
/// ///
typedef struct _cef_menu_button_delegate_t { typedef struct _cef_menu_button_delegate_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_button_delegate_t base; cef_button_delegate_t base;
/// ///
// Called when |button| is pressed. Call cef_menu_button_t::show_menu() to /// Called when |button| is pressed. Call cef_menu_button_t::show_menu() to
// show a popup menu at |screen_point|. When showing a custom popup such as a /// show a popup menu at |screen_point|. When showing a custom popup such as a
// window keep a reference to |button_pressed_lock| until the popup is hidden /// window keep a reference to |button_pressed_lock| until the popup is hidden
// to maintain the pressed button state. /// to maintain the pressed button state.
/// ///
void(CEF_CALLBACK* on_menu_button_pressed)( void(CEF_CALLBACK* on_menu_button_pressed)(
struct _cef_menu_button_delegate_t* self, struct _cef_menu_button_delegate_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=14eaca76dba704ee64f454aaca821a6818012fc6$ // $hash=937ed3958b86682a88a09493aa5e9e4014d3bbc2$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_OVERLAY_CONTROLLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_OVERLAY_CONTROLLER_CAPI_H_
@ -50,161 +50,162 @@ struct _cef_view_t;
struct _cef_window_t; struct _cef_window_t;
/// ///
// Controller for an overlay that contains a contents View added via /// Controller for an overlay that contains a contents View added via
// cef_window_t::AddOverlayView. Methods exposed by this controller should be /// cef_window_t::AddOverlayView. Methods exposed by this controller should be
// called in preference to functions of the same name exposed by the contents /// called in preference to functions of the same name exposed by the contents
// View unless otherwise indicated. Methods must be called on the browser /// View unless otherwise indicated. Methods must be called on the browser
// process UI thread unless otherwise indicated. /// process UI thread unless otherwise indicated.
/// ///
typedef struct _cef_overlay_controller_t { typedef struct _cef_overlay_controller_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns true (1) if this object is valid. /// Returns true (1) if this object is valid.
/// ///
int(CEF_CALLBACK* is_valid)(struct _cef_overlay_controller_t* self); int(CEF_CALLBACK* is_valid)(struct _cef_overlay_controller_t* self);
/// ///
// Returns true (1) if this object is the same as |that| object. /// Returns true (1) if this object is the same as |that| object.
/// ///
int(CEF_CALLBACK* is_same)(struct _cef_overlay_controller_t* self, int(CEF_CALLBACK* is_same)(struct _cef_overlay_controller_t* self,
struct _cef_overlay_controller_t* that); struct _cef_overlay_controller_t* that);
/// ///
// Returns the contents View for this overlay. /// Returns the contents View for this overlay.
/// ///
struct _cef_view_t*(CEF_CALLBACK* get_contents_view)( struct _cef_view_t*(CEF_CALLBACK* get_contents_view)(
struct _cef_overlay_controller_t* self); struct _cef_overlay_controller_t* self);
/// ///
// Returns the top-level Window hosting this overlay. Use this function /// Returns the top-level Window hosting this overlay. Use this function
// instead of calling get_window() on the contents View. /// instead of calling get_window() on the contents View.
/// ///
struct _cef_window_t*(CEF_CALLBACK* get_window)( struct _cef_window_t*(CEF_CALLBACK* get_window)(
struct _cef_overlay_controller_t* self); struct _cef_overlay_controller_t* self);
/// ///
// Returns the docking mode for this overlay. /// Returns the docking mode for this overlay.
/// ///
cef_docking_mode_t(CEF_CALLBACK* get_docking_mode)( cef_docking_mode_t(CEF_CALLBACK* get_docking_mode)(
struct _cef_overlay_controller_t* self); struct _cef_overlay_controller_t* self);
/// ///
// Destroy this overlay. /// Destroy this overlay.
/// ///
void(CEF_CALLBACK* destroy)(struct _cef_overlay_controller_t* self); void(CEF_CALLBACK* destroy)(struct _cef_overlay_controller_t* self);
/// ///
// Sets the bounds (size and position) of this overlay. This will set the /// Sets the bounds (size and position) of this overlay. This will set the
// bounds of the contents View to match and trigger a re-layout if necessary. /// bounds of the contents View to match and trigger a re-layout if necessary.
// |bounds| is in parent coordinates and any insets configured on this overlay /// |bounds| is in parent coordinates and any insets configured on this
// will be ignored. Use this function only for overlays created with a docking /// overlay will be ignored. Use this function only for overlays created with
// mode value of CEF_DOCKING_MODE_CUSTOM. With other docking modes modify the /// a docking mode value of CEF_DOCKING_MODE_CUSTOM. With other docking modes
// insets of this overlay and/or layout of the contents View and call /// modify the insets of this overlay and/or layout of the contents View and
// size_to_preferred_size() instead to calculate the new size and re-position /// call size_to_preferred_size() instead to calculate the new size and re-
// the overlay if necessary. /// position the overlay if necessary.
/// ///
void(CEF_CALLBACK* set_bounds)(struct _cef_overlay_controller_t* self, void(CEF_CALLBACK* set_bounds)(struct _cef_overlay_controller_t* self,
const cef_rect_t* bounds); const cef_rect_t* bounds);
/// ///
// Returns the bounds (size and position) of this overlay in parent /// Returns the bounds (size and position) of this overlay in parent
// coordinates. /// coordinates.
/// ///
cef_rect_t(CEF_CALLBACK* get_bounds)(struct _cef_overlay_controller_t* self); cef_rect_t(CEF_CALLBACK* get_bounds)(struct _cef_overlay_controller_t* self);
/// ///
// Returns the bounds (size and position) of this overlay in DIP screen /// Returns the bounds (size and position) of this overlay in DIP screen
// coordinates. /// coordinates.
/// ///
cef_rect_t(CEF_CALLBACK* get_bounds_in_screen)( cef_rect_t(CEF_CALLBACK* get_bounds_in_screen)(
struct _cef_overlay_controller_t* self); struct _cef_overlay_controller_t* self);
/// ///
// Sets the size of this overlay without changing the position. This will set /// Sets the size of this overlay without changing the position. This will set
// the size of the contents View to match and trigger a re-layout if /// the size of the contents View to match and trigger a re-layout if
// necessary. |size| is in parent coordinates and any insets configured on /// necessary. |size| is in parent coordinates and any insets configured on
// this overlay will be ignored. Use this function only for overlays created /// this overlay will be ignored. Use this function only for overlays created
// with a docking mode value of CEF_DOCKING_MODE_CUSTOM. With other docking /// with a docking mode value of CEF_DOCKING_MODE_CUSTOM. With other docking
// modes modify the insets of this overlay and/or layout of the contents View /// modes modify the insets of this overlay and/or layout of the contents View
// and call size_to_preferred_size() instead to calculate the new size and re- /// and call size_to_preferred_size() instead to calculate the new size and
// position the overlay if necessary. /// re-position the overlay if necessary.
/// ///
void(CEF_CALLBACK* set_size)(struct _cef_overlay_controller_t* self, void(CEF_CALLBACK* set_size)(struct _cef_overlay_controller_t* self,
const cef_size_t* size); const cef_size_t* size);
/// ///
// Returns the size of this overlay in parent coordinates. /// Returns the size of this overlay in parent coordinates.
/// ///
cef_size_t(CEF_CALLBACK* get_size)(struct _cef_overlay_controller_t* self); cef_size_t(CEF_CALLBACK* get_size)(struct _cef_overlay_controller_t* self);
/// ///
// Sets the position of this overlay without changing the size. |position| is /// Sets the position of this overlay without changing the size. |position| is
// in parent coordinates and any insets configured on this overlay will be /// in parent coordinates and any insets configured on this overlay will be
// ignored. Use this function only for overlays created with a docking mode /// ignored. Use this function only for overlays created with a docking mode
// value of CEF_DOCKING_MODE_CUSTOM. With other docking modes modify the /// value of CEF_DOCKING_MODE_CUSTOM. With other docking modes modify the
// insets of this overlay and/or layout of the contents View and call /// insets of this overlay and/or layout of the contents View and call
// size_to_preferred_size() instead to calculate the new size and re-position /// size_to_preferred_size() instead to calculate the new size and re-position
// the overlay if necessary. /// the overlay if necessary.
/// ///
void(CEF_CALLBACK* set_position)(struct _cef_overlay_controller_t* self, void(CEF_CALLBACK* set_position)(struct _cef_overlay_controller_t* self,
const cef_point_t* position); const cef_point_t* position);
/// ///
// Returns the position of this overlay in parent coordinates. /// Returns the position of this overlay in parent coordinates.
/// ///
cef_point_t(CEF_CALLBACK* get_position)( cef_point_t(CEF_CALLBACK* get_position)(
struct _cef_overlay_controller_t* self); struct _cef_overlay_controller_t* self);
/// ///
// Sets the insets for this overlay. |insets| is in parent coordinates. Use /// Sets the insets for this overlay. |insets| is in parent coordinates. Use
// this function only for overlays created with a docking mode value other /// this function only for overlays created with a docking mode value other
// than CEF_DOCKING_MODE_CUSTOM. /// than CEF_DOCKING_MODE_CUSTOM.
/// ///
void(CEF_CALLBACK* set_insets)(struct _cef_overlay_controller_t* self, void(CEF_CALLBACK* set_insets)(struct _cef_overlay_controller_t* self,
const cef_insets_t* insets); const cef_insets_t* insets);
/// ///
// Returns the insets for this overlay in parent coordinates. /// Returns the insets for this overlay in parent coordinates.
/// ///
cef_insets_t(CEF_CALLBACK* get_insets)( cef_insets_t(CEF_CALLBACK* get_insets)(
struct _cef_overlay_controller_t* self); struct _cef_overlay_controller_t* self);
/// ///
// Size this overlay to its preferred size and trigger a re-layout if /// Size this overlay to its preferred size and trigger a re-layout if
// necessary. The position of overlays created with a docking mode value of /// necessary. The position of overlays created with a docking mode value of
// CEF_DOCKING_MODE_CUSTOM will not be modified by calling this function. With /// CEF_DOCKING_MODE_CUSTOM will not be modified by calling this function.
// other docking modes this function may re-position the overlay if necessary /// With other docking modes this function may re-position the overlay if
// to accommodate the new size and any insets configured on the contents View. /// necessary to accommodate the new size and any insets configured on the
/// contents View.
/// ///
void(CEF_CALLBACK* size_to_preferred_size)( void(CEF_CALLBACK* size_to_preferred_size)(
struct _cef_overlay_controller_t* self); struct _cef_overlay_controller_t* self);
/// ///
// Sets whether this overlay is visible. Overlays are hidden by default. If /// Sets whether this overlay is visible. Overlays are hidden by default. If
// this overlay is hidden then it and any child Views will not be drawn and, /// this overlay is hidden then it and any child Views will not be drawn and,
// if any of those Views currently have focus, then focus will also be /// if any of those Views currently have focus, then focus will also be
// cleared. Painting is scheduled as needed. /// cleared. Painting is scheduled as needed.
/// ///
void(CEF_CALLBACK* set_visible)(struct _cef_overlay_controller_t* self, void(CEF_CALLBACK* set_visible)(struct _cef_overlay_controller_t* self,
int visible); int visible);
/// ///
// Returns whether this overlay is visible. A View may be visible but still /// Returns whether this overlay is visible. A View may be visible but still
// not drawn in a Window if any parent Views are hidden. Call is_drawn() to /// not drawn in a Window if any parent Views are hidden. Call is_drawn() to
// determine whether this overlay and all parent Views are visible and will be /// determine whether this overlay and all parent Views are visible and will
// drawn. /// be drawn.
/// ///
int(CEF_CALLBACK* is_visible)(struct _cef_overlay_controller_t* self); int(CEF_CALLBACK* is_visible)(struct _cef_overlay_controller_t* self);
/// ///
// Returns whether this overlay is visible and drawn in a Window. A View is /// Returns whether this overlay is visible and drawn in a Window. A View is
// drawn if it and all parent Views are visible. To determine if the /// drawn if it and all parent Views are visible. To determine if the
// containing Window is visible to the user on-screen call is_visible() on the /// containing Window is visible to the user on-screen call is_visible() on
// Window. /// the Window.
/// ///
int(CEF_CALLBACK* is_drawn)(struct _cef_overlay_controller_t* self); int(CEF_CALLBACK* is_drawn)(struct _cef_overlay_controller_t* self);
} cef_overlay_controller_t; } cef_overlay_controller_t;

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=f1d8fe499762ec23c39dea879b9701c6685179ec$ // $hash=7dbcb8d40d3f5ac18dee74621fe472e9ab089f8a$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_PANEL_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_PANEL_CAPI_H_
@ -53,93 +53,93 @@ struct _cef_layout_t;
struct _cef_window_t; struct _cef_window_t;
/// ///
// A Panel is a container in the views hierarchy that can contain other Views as /// A Panel is a container in the views hierarchy that can contain other Views
// children. Methods must be called on the browser process UI thread unless /// as children. Methods must be called on the browser process UI thread unless
// otherwise indicated. /// otherwise indicated.
/// ///
typedef struct _cef_panel_t { typedef struct _cef_panel_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_view_t base; cef_view_t base;
/// ///
// Returns this Panel as a Window or NULL if this is not a Window. /// Returns this Panel as a Window or NULL if this is not a Window.
/// ///
struct _cef_window_t*(CEF_CALLBACK* as_window)(struct _cef_panel_t* self); struct _cef_window_t*(CEF_CALLBACK* as_window)(struct _cef_panel_t* self);
/// ///
// Set this Panel's Layout to FillLayout and return the FillLayout object. /// Set this Panel's Layout to FillLayout and return the FillLayout object.
/// ///
struct _cef_fill_layout_t*(CEF_CALLBACK* set_to_fill_layout)( struct _cef_fill_layout_t*(CEF_CALLBACK* set_to_fill_layout)(
struct _cef_panel_t* self); struct _cef_panel_t* self);
/// ///
// Set this Panel's Layout to BoxLayout and return the BoxLayout object. /// Set this Panel's Layout to BoxLayout and return the BoxLayout object.
/// ///
struct _cef_box_layout_t*(CEF_CALLBACK* set_to_box_layout)( struct _cef_box_layout_t*(CEF_CALLBACK* set_to_box_layout)(
struct _cef_panel_t* self, struct _cef_panel_t* self,
const cef_box_layout_settings_t* settings); const cef_box_layout_settings_t* settings);
/// ///
// Get the Layout. /// Get the Layout.
/// ///
struct _cef_layout_t*(CEF_CALLBACK* get_layout)(struct _cef_panel_t* self); struct _cef_layout_t*(CEF_CALLBACK* get_layout)(struct _cef_panel_t* self);
/// ///
// Lay out the child Views (set their bounds based on sizing heuristics /// Lay out the child Views (set their bounds based on sizing heuristics
// specific to the current Layout). /// specific to the current Layout).
/// ///
void(CEF_CALLBACK* layout)(struct _cef_panel_t* self); void(CEF_CALLBACK* layout)(struct _cef_panel_t* self);
/// ///
// Add a child View. /// Add a child View.
/// ///
void(CEF_CALLBACK* add_child_view)(struct _cef_panel_t* self, void(CEF_CALLBACK* add_child_view)(struct _cef_panel_t* self,
struct _cef_view_t* view); struct _cef_view_t* view);
/// ///
// Add a child View at the specified |index|. If |index| matches the result of /// Add a child View at the specified |index|. If |index| matches the result
// GetChildCount() then the View will be added at the end. /// of GetChildCount() then the View will be added at the end.
/// ///
void(CEF_CALLBACK* add_child_view_at)(struct _cef_panel_t* self, void(CEF_CALLBACK* add_child_view_at)(struct _cef_panel_t* self,
struct _cef_view_t* view, struct _cef_view_t* view,
int index); int index);
/// ///
// Move the child View to the specified |index|. A negative value for |index| /// Move the child View to the specified |index|. A negative value for |index|
// will move the View to the end. /// will move the View to the end.
/// ///
void(CEF_CALLBACK* reorder_child_view)(struct _cef_panel_t* self, void(CEF_CALLBACK* reorder_child_view)(struct _cef_panel_t* self,
struct _cef_view_t* view, struct _cef_view_t* view,
int index); int index);
/// ///
// Remove a child View. The View can then be added to another Panel. /// Remove a child View. The View can then be added to another Panel.
/// ///
void(CEF_CALLBACK* remove_child_view)(struct _cef_panel_t* self, void(CEF_CALLBACK* remove_child_view)(struct _cef_panel_t* self,
struct _cef_view_t* view); struct _cef_view_t* view);
/// ///
// Remove all child Views. The removed Views will be deleted if the client /// Remove all child Views. The removed Views will be deleted if the client
// holds no references to them. /// holds no references to them.
/// ///
void(CEF_CALLBACK* remove_all_child_views)(struct _cef_panel_t* self); void(CEF_CALLBACK* remove_all_child_views)(struct _cef_panel_t* self);
/// ///
// Returns the number of child Views. /// Returns the number of child Views.
/// ///
size_t(CEF_CALLBACK* get_child_view_count)(struct _cef_panel_t* self); size_t(CEF_CALLBACK* get_child_view_count)(struct _cef_panel_t* self);
/// ///
// Returns the child View at the specified |index|. /// Returns the child View at the specified |index|.
/// ///
struct _cef_view_t*( struct _cef_view_t*(
CEF_CALLBACK* get_child_view_at)(struct _cef_panel_t* self, int index); CEF_CALLBACK* get_child_view_at)(struct _cef_panel_t* self, int index);
} cef_panel_t; } cef_panel_t;
/// ///
// Create a new Panel. /// Create a new Panel.
/// ///
CEF_EXPORT cef_panel_t* cef_panel_create( CEF_EXPORT cef_panel_t* cef_panel_create(
struct _cef_panel_delegate_t* delegate); struct _cef_panel_delegate_t* delegate);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=3b6b3ef725189debb1dd43db395a111f50dee60c$ // $hash=ce2d8e40ebdd803221ebcd26dab9461984917fd4$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_PANEL_DELEGATE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_PANEL_DELEGATE_CAPI_H_
@ -47,13 +47,13 @@ extern "C" {
#endif #endif
/// ///
// Implement this structure to handle Panel events. The functions of this /// Implement this structure to handle Panel events. The functions of this
// structure will be called on the browser process UI thread unless otherwise /// structure will be called on the browser process UI thread unless otherwise
// indicated. /// indicated.
/// ///
typedef struct _cef_panel_delegate_t { typedef struct _cef_panel_delegate_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_view_delegate_t base; cef_view_delegate_t base;
} cef_panel_delegate_t; } cef_panel_delegate_t;

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=374b16fddbbb8bedc2dbb2e03dcfaa8cddba6aeb$ // $hash=26037d0a585f2d93f19ee0417be670a706ff42ff$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_SCROLL_VIEW_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_SCROLL_VIEW_CAPI_H_
@ -47,60 +47,60 @@ extern "C" {
#endif #endif
/// ///
// A ScrollView will show horizontal and/or vertical scrollbars when necessary /// A ScrollView will show horizontal and/or vertical scrollbars when necessary
// based on the size of the attached content view. Methods must be called on the /// based on the size of the attached content view. Methods must be called on
// browser process UI thread unless otherwise indicated. /// the browser process UI thread unless otherwise indicated.
/// ///
typedef struct _cef_scroll_view_t { typedef struct _cef_scroll_view_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_view_t base; cef_view_t base;
/// ///
// Set the content View. The content View must have a specified size (e.g. via /// Set the content View. The content View must have a specified size (e.g.
// cef_view_t::SetBounds or cef_view_delegate_t::GetPreferredSize). /// via cef_view_t::SetBounds or cef_view_delegate_t::GetPreferredSize).
/// ///
void(CEF_CALLBACK* set_content_view)(struct _cef_scroll_view_t* self, void(CEF_CALLBACK* set_content_view)(struct _cef_scroll_view_t* self,
struct _cef_view_t* view); struct _cef_view_t* view);
/// ///
// Returns the content View. /// Returns the content View.
/// ///
struct _cef_view_t*(CEF_CALLBACK* get_content_view)( struct _cef_view_t*(CEF_CALLBACK* get_content_view)(
struct _cef_scroll_view_t* self); struct _cef_scroll_view_t* self);
/// ///
// Returns the visible region of the content View. /// Returns the visible region of the content View.
/// ///
cef_rect_t(CEF_CALLBACK* get_visible_content_rect)( cef_rect_t(CEF_CALLBACK* get_visible_content_rect)(
struct _cef_scroll_view_t* self); struct _cef_scroll_view_t* self);
/// ///
// Returns true (1) if the horizontal scrollbar is currently showing. /// Returns true (1) if the horizontal scrollbar is currently showing.
/// ///
int(CEF_CALLBACK* has_horizontal_scrollbar)(struct _cef_scroll_view_t* self); int(CEF_CALLBACK* has_horizontal_scrollbar)(struct _cef_scroll_view_t* self);
/// ///
// Returns the height of the horizontal scrollbar. /// Returns the height of the horizontal scrollbar.
/// ///
int(CEF_CALLBACK* get_horizontal_scrollbar_height)( int(CEF_CALLBACK* get_horizontal_scrollbar_height)(
struct _cef_scroll_view_t* self); struct _cef_scroll_view_t* self);
/// ///
// Returns true (1) if the vertical scrollbar is currently showing. /// Returns true (1) if the vertical scrollbar is currently showing.
/// ///
int(CEF_CALLBACK* has_vertical_scrollbar)(struct _cef_scroll_view_t* self); int(CEF_CALLBACK* has_vertical_scrollbar)(struct _cef_scroll_view_t* self);
/// ///
// Returns the width of the vertical scrollbar. /// Returns the width of the vertical scrollbar.
/// ///
int(CEF_CALLBACK* get_vertical_scrollbar_width)( int(CEF_CALLBACK* get_vertical_scrollbar_width)(
struct _cef_scroll_view_t* self); struct _cef_scroll_view_t* self);
} cef_scroll_view_t; } cef_scroll_view_t;
/// ///
// Create a new ScrollView. /// Create a new ScrollView.
/// ///
CEF_EXPORT cef_scroll_view_t* cef_scroll_view_create( CEF_EXPORT cef_scroll_view_t* cef_scroll_view_create(
struct _cef_view_delegate_t* delegate); struct _cef_view_delegate_t* delegate);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=798f84672412f544765b800d03cf284b066f818c$ // $hash=a38b506d8bc425f3de4809c02d0ec4bc558eb518$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_TEXTFIELD_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_TEXTFIELD_CAPI_H_
@ -48,166 +48,167 @@ extern "C" {
#endif #endif
/// ///
// A Textfield supports editing of text. This control is custom rendered with no /// A Textfield supports editing of text. This control is custom rendered with
// platform-specific code. Methods must be called on the browser process UI /// no platform-specific code. Methods must be called on the browser process UI
// thread unless otherwise indicated. /// thread unless otherwise indicated.
/// ///
typedef struct _cef_textfield_t { typedef struct _cef_textfield_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_view_t base; cef_view_t base;
/// ///
// Sets whether the text will be displayed as asterisks. /// Sets whether the text will be displayed as asterisks.
/// ///
void(CEF_CALLBACK* set_password_input)(struct _cef_textfield_t* self, void(CEF_CALLBACK* set_password_input)(struct _cef_textfield_t* self,
int password_input); int password_input);
/// ///
// Returns true (1) if the text will be displayed as asterisks. /// Returns true (1) if the text will be displayed as asterisks.
/// ///
int(CEF_CALLBACK* is_password_input)(struct _cef_textfield_t* self); int(CEF_CALLBACK* is_password_input)(struct _cef_textfield_t* self);
/// ///
// Sets whether the text will read-only. /// Sets whether the text will read-only.
/// ///
void(CEF_CALLBACK* set_read_only)(struct _cef_textfield_t* self, void(CEF_CALLBACK* set_read_only)(struct _cef_textfield_t* self,
int read_only); int read_only);
/// ///
// Returns true (1) if the text is read-only. /// Returns true (1) if the text is read-only.
/// ///
int(CEF_CALLBACK* is_read_only)(struct _cef_textfield_t* self); int(CEF_CALLBACK* is_read_only)(struct _cef_textfield_t* self);
/// ///
// Returns the currently displayed text. /// Returns the currently displayed text.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_text)(struct _cef_textfield_t* self); cef_string_userfree_t(CEF_CALLBACK* get_text)(struct _cef_textfield_t* self);
/// ///
// Sets the contents to |text|. The cursor will be moved to end of the text if /// Sets the contents to |text|. The cursor will be moved to end of the text
// the current position is outside of the text range. /// if the current position is outside of the text range.
/// ///
void(CEF_CALLBACK* set_text)(struct _cef_textfield_t* self, void(CEF_CALLBACK* set_text)(struct _cef_textfield_t* self,
const cef_string_t* text); const cef_string_t* text);
/// ///
// Appends |text| to the previously-existing text. /// Appends |text| to the previously-existing text.
/// ///
void(CEF_CALLBACK* append_text)(struct _cef_textfield_t* self, void(CEF_CALLBACK* append_text)(struct _cef_textfield_t* self,
const cef_string_t* text); const cef_string_t* text);
/// ///
// Inserts |text| at the current cursor position replacing any selected text. /// Inserts |text| at the current cursor position replacing any selected text.
/// ///
void(CEF_CALLBACK* insert_or_replace_text)(struct _cef_textfield_t* self, void(CEF_CALLBACK* insert_or_replace_text)(struct _cef_textfield_t* self,
const cef_string_t* text); const cef_string_t* text);
/// ///
// Returns true (1) if there is any selected text. /// Returns true (1) if there is any selected text.
/// ///
int(CEF_CALLBACK* has_selection)(struct _cef_textfield_t* self); int(CEF_CALLBACK* has_selection)(struct _cef_textfield_t* self);
/// ///
// Returns the currently selected text. /// Returns the currently selected text.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_selected_text)( cef_string_userfree_t(CEF_CALLBACK* get_selected_text)(
struct _cef_textfield_t* self); struct _cef_textfield_t* self);
/// ///
// Selects all text. If |reversed| is true (1) the range will end at the /// Selects all text. If |reversed| is true (1) the range will end at the
// logical beginning of the text; this generally shows the leading portion of /// logical beginning of the text; this generally shows the leading portion of
// text that overflows its display area. /// text that overflows its display area.
/// ///
void(CEF_CALLBACK* select_all)(struct _cef_textfield_t* self, int reversed); void(CEF_CALLBACK* select_all)(struct _cef_textfield_t* self, int reversed);
/// ///
// Clears the text selection and sets the caret to the end. /// Clears the text selection and sets the caret to the end.
/// ///
void(CEF_CALLBACK* clear_selection)(struct _cef_textfield_t* self); void(CEF_CALLBACK* clear_selection)(struct _cef_textfield_t* self);
/// ///
// Returns the selected logical text range. /// Returns the selected logical text range.
/// ///
cef_range_t(CEF_CALLBACK* get_selected_range)(struct _cef_textfield_t* self); cef_range_t(CEF_CALLBACK* get_selected_range)(struct _cef_textfield_t* self);
/// ///
// Selects the specified logical text range. /// Selects the specified logical text range.
/// ///
void(CEF_CALLBACK* select_range)(struct _cef_textfield_t* self, void(CEF_CALLBACK* select_range)(struct _cef_textfield_t* self,
const cef_range_t* range); const cef_range_t* range);
/// ///
// Returns the current cursor position. /// Returns the current cursor position.
/// ///
size_t(CEF_CALLBACK* get_cursor_position)(struct _cef_textfield_t* self); size_t(CEF_CALLBACK* get_cursor_position)(struct _cef_textfield_t* self);
/// ///
// Sets the text color. /// Sets the text color.
/// ///
void(CEF_CALLBACK* set_text_color)(struct _cef_textfield_t* self, void(CEF_CALLBACK* set_text_color)(struct _cef_textfield_t* self,
cef_color_t color); cef_color_t color);
/// ///
// Returns the text color. /// Returns the text color.
/// ///
cef_color_t(CEF_CALLBACK* get_text_color)(struct _cef_textfield_t* self); cef_color_t(CEF_CALLBACK* get_text_color)(struct _cef_textfield_t* self);
/// ///
// Sets the selection text color. /// Sets the selection text color.
/// ///
void(CEF_CALLBACK* set_selection_text_color)(struct _cef_textfield_t* self, void(CEF_CALLBACK* set_selection_text_color)(struct _cef_textfield_t* self,
cef_color_t color); cef_color_t color);
/// ///
// Returns the selection text color. /// Returns the selection text color.
/// ///
cef_color_t(CEF_CALLBACK* get_selection_text_color)( cef_color_t(CEF_CALLBACK* get_selection_text_color)(
struct _cef_textfield_t* self); struct _cef_textfield_t* self);
/// ///
// Sets the selection background color. /// Sets the selection background color.
/// ///
void(CEF_CALLBACK* set_selection_background_color)( void(CEF_CALLBACK* set_selection_background_color)(
struct _cef_textfield_t* self, struct _cef_textfield_t* self,
cef_color_t color); cef_color_t color);
/// ///
// Returns the selection background color. /// Returns the selection background color.
/// ///
cef_color_t(CEF_CALLBACK* get_selection_background_color)( cef_color_t(CEF_CALLBACK* get_selection_background_color)(
struct _cef_textfield_t* self); struct _cef_textfield_t* self);
/// ///
// Sets the font list. The format is "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", /// Sets the font list. The format is "<FONT_FAMILY_LIST>,[STYLES] <SIZE>",
// where: - FONT_FAMILY_LIST is a comma-separated list of font family names, - /// where: - FONT_FAMILY_LIST is a comma-separated list of font family names,
// STYLES is an optional space-separated list of style names (case-sensitive /// - STYLES is an optional space-separated list of style names (case-
// "Bold" and "Italic" are supported), and /// sensitive
// - SIZE is an integer font size in pixels with the suffix "px". /// "Bold" and "Italic" are supported), and
// /// - SIZE is an integer font size in pixels with the suffix "px".
// Here are examples of valid font description strings: - "Arial, Helvetica, ///
// Bold Italic 14px" - "Arial, 14px" /// Here are examples of valid font description strings: - "Arial, Helvetica,
/// Bold Italic 14px" - "Arial, 14px"
/// ///
void(CEF_CALLBACK* set_font_list)(struct _cef_textfield_t* self, void(CEF_CALLBACK* set_font_list)(struct _cef_textfield_t* self,
const cef_string_t* font_list); const cef_string_t* font_list);
/// ///
// Applies |color| to the specified |range| without changing the default /// Applies |color| to the specified |range| without changing the default
// color. If |range| is NULL the color will be set on the complete text /// color. If |range| is NULL the color will be set on the complete text
// contents. /// contents.
/// ///
void(CEF_CALLBACK* apply_text_color)(struct _cef_textfield_t* self, void(CEF_CALLBACK* apply_text_color)(struct _cef_textfield_t* self,
cef_color_t color, cef_color_t color,
const cef_range_t* range); const cef_range_t* range);
/// ///
// Applies |style| to the specified |range| without changing the default /// Applies |style| to the specified |range| without changing the default
// style. If |add| is true (1) the style will be added, otherwise the style /// style. If |add| is true (1) the style will be added, otherwise the style
// will be removed. If |range| is NULL the style will be set on the complete /// will be removed. If |range| is NULL the style will be set on the complete
// text contents. /// text contents.
/// ///
void(CEF_CALLBACK* apply_text_style)(struct _cef_textfield_t* self, void(CEF_CALLBACK* apply_text_style)(struct _cef_textfield_t* self,
cef_text_style_t style, cef_text_style_t style,
@ -215,53 +216,53 @@ typedef struct _cef_textfield_t {
const cef_range_t* range); const cef_range_t* range);
/// ///
// Returns true (1) if the action associated with the specified command id is /// Returns true (1) if the action associated with the specified command id is
// enabled. See additional comments on execute_command(). /// enabled. See additional comments on execute_command().
/// ///
int(CEF_CALLBACK* is_command_enabled)(struct _cef_textfield_t* self, int(CEF_CALLBACK* is_command_enabled)(struct _cef_textfield_t* self,
cef_text_field_commands_t command_id); cef_text_field_commands_t command_id);
/// ///
// Performs the action associated with the specified command id. /// Performs the action associated with the specified command id.
/// ///
void(CEF_CALLBACK* execute_command)(struct _cef_textfield_t* self, void(CEF_CALLBACK* execute_command)(struct _cef_textfield_t* self,
cef_text_field_commands_t command_id); cef_text_field_commands_t command_id);
/// ///
// Clears Edit history. /// Clears Edit history.
/// ///
void(CEF_CALLBACK* clear_edit_history)(struct _cef_textfield_t* self); void(CEF_CALLBACK* clear_edit_history)(struct _cef_textfield_t* self);
/// ///
// Sets the placeholder text that will be displayed when the Textfield is /// Sets the placeholder text that will be displayed when the Textfield is
// NULL. /// NULL.
/// ///
void(CEF_CALLBACK* set_placeholder_text)(struct _cef_textfield_t* self, void(CEF_CALLBACK* set_placeholder_text)(struct _cef_textfield_t* self,
const cef_string_t* text); const cef_string_t* text);
/// ///
// Returns the placeholder text that will be displayed when the Textfield is /// Returns the placeholder text that will be displayed when the Textfield is
// NULL. /// NULL.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_placeholder_text)( cef_string_userfree_t(CEF_CALLBACK* get_placeholder_text)(
struct _cef_textfield_t* self); struct _cef_textfield_t* self);
/// ///
// Sets the placeholder text color. /// Sets the placeholder text color.
/// ///
void(CEF_CALLBACK* set_placeholder_text_color)(struct _cef_textfield_t* self, void(CEF_CALLBACK* set_placeholder_text_color)(struct _cef_textfield_t* self,
cef_color_t color); cef_color_t color);
/// ///
// Set the accessible name that will be exposed to assistive technology (AT). /// Set the accessible name that will be exposed to assistive technology (AT).
/// ///
void(CEF_CALLBACK* set_accessible_name)(struct _cef_textfield_t* self, void(CEF_CALLBACK* set_accessible_name)(struct _cef_textfield_t* self,
const cef_string_t* name); const cef_string_t* name);
} cef_textfield_t; } cef_textfield_t;
/// ///
// Create a new Textfield. /// Create a new Textfield.
/// ///
CEF_EXPORT cef_textfield_t* cef_textfield_create( CEF_EXPORT cef_textfield_t* cef_textfield_create(
struct _cef_textfield_delegate_t* delegate); struct _cef_textfield_delegate_t* delegate);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=8ad9c657c396aa3e9538ff2ab8b0512e55930f03$ // $hash=43f4bcda7e81ee1750f5a4c220832455f1ab8300$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_TEXTFIELD_DELEGATE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_TEXTFIELD_DELEGATE_CAPI_H_
@ -49,27 +49,27 @@ extern "C" {
struct _cef_textfield_t; struct _cef_textfield_t;
/// ///
// Implement this structure to handle Textfield events. The functions of this /// Implement this structure to handle Textfield events. The functions of this
// structure will be called on the browser process UI thread unless otherwise /// structure will be called on the browser process UI thread unless otherwise
// indicated. /// indicated.
/// ///
typedef struct _cef_textfield_delegate_t { typedef struct _cef_textfield_delegate_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_view_delegate_t base; cef_view_delegate_t base;
/// ///
// Called when |textfield| recieves a keyboard event. |event| contains /// Called when |textfield| recieves a keyboard event. |event| contains
// information about the keyboard event. Return true (1) if the keyboard event /// information about the keyboard event. Return true (1) if the keyboard
// was handled or false (0) otherwise for default handling. /// event was handled or false (0) otherwise for default handling.
/// ///
int(CEF_CALLBACK* on_key_event)(struct _cef_textfield_delegate_t* self, int(CEF_CALLBACK* on_key_event)(struct _cef_textfield_delegate_t* self,
struct _cef_textfield_t* textfield, struct _cef_textfield_t* textfield,
const cef_key_event_t* event); const cef_key_event_t* event);
/// ///
// Called after performing a user action that may change |textfield|. /// Called after performing a user action that may change |textfield|.
/// ///
void(CEF_CALLBACK* on_after_user_action)( void(CEF_CALLBACK* on_after_user_action)(
struct _cef_textfield_delegate_t* self, struct _cef_textfield_delegate_t* self,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=d2aadfa4159846c2719387e2814d5e108def4b81$ // $hash=dcda9eb9c6258b68faed06f9edfdcabbbb3e7000$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_VIEW_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_VIEW_CAPI_H_
@ -54,349 +54,352 @@ struct _cef_textfield_t;
struct _cef_window_t; struct _cef_window_t;
/// ///
// A View is a rectangle within the views View hierarchy. It is the base /// A View is a rectangle within the views View hierarchy. It is the base
// structure for all Views. All size and position values are in density /// structure for all Views. All size and position values are in density
// independent pixels (DIP) unless otherwise indicated. Methods must be called /// independent pixels (DIP) unless otherwise indicated. Methods must be called
// on the browser process UI thread unless otherwise indicated. /// on the browser process UI thread unless otherwise indicated.
/// ///
typedef struct _cef_view_t { typedef struct _cef_view_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Returns this View as a BrowserView or NULL if this is not a BrowserView. /// Returns this View as a BrowserView or NULL if this is not a BrowserView.
/// ///
struct _cef_browser_view_t*(CEF_CALLBACK* as_browser_view)( struct _cef_browser_view_t*(CEF_CALLBACK* as_browser_view)(
struct _cef_view_t* self); struct _cef_view_t* self);
/// ///
// Returns this View as a Button or NULL if this is not a Button. /// Returns this View as a Button or NULL if this is not a Button.
/// ///
struct _cef_button_t*(CEF_CALLBACK* as_button)(struct _cef_view_t* self); struct _cef_button_t*(CEF_CALLBACK* as_button)(struct _cef_view_t* self);
/// ///
// Returns this View as a Panel or NULL if this is not a Panel. /// Returns this View as a Panel or NULL if this is not a Panel.
/// ///
struct _cef_panel_t*(CEF_CALLBACK* as_panel)(struct _cef_view_t* self); struct _cef_panel_t*(CEF_CALLBACK* as_panel)(struct _cef_view_t* self);
/// ///
// Returns this View as a ScrollView or NULL if this is not a ScrollView. /// Returns this View as a ScrollView or NULL if this is not a ScrollView.
/// ///
struct _cef_scroll_view_t*(CEF_CALLBACK* as_scroll_view)( struct _cef_scroll_view_t*(CEF_CALLBACK* as_scroll_view)(
struct _cef_view_t* self); struct _cef_view_t* self);
/// ///
// Returns this View as a Textfield or NULL if this is not a Textfield. /// Returns this View as a Textfield or NULL if this is not a Textfield.
/// ///
struct _cef_textfield_t*(CEF_CALLBACK* as_textfield)( struct _cef_textfield_t*(CEF_CALLBACK* as_textfield)(
struct _cef_view_t* self); struct _cef_view_t* self);
/// ///
// Returns the type of this View as a string. Used primarily for testing /// Returns the type of this View as a string. Used primarily for testing
// purposes. /// purposes.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_type_string)( cef_string_userfree_t(CEF_CALLBACK* get_type_string)(
struct _cef_view_t* self); struct _cef_view_t* self);
/// ///
// Returns a string representation of this View which includes the type and /// Returns a string representation of this View which includes the type and
// various type-specific identifying attributes. If |include_children| is true /// various type-specific identifying attributes. If |include_children| is
// (1) any child Views will also be included. Used primarily for testing /// true (1) any child Views will also be included. Used primarily for testing
// purposes. /// purposes.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* to_string)(struct _cef_view_t* self, cef_string_userfree_t(CEF_CALLBACK* to_string)(struct _cef_view_t* self,
int include_children); int include_children);
/// ///
// Returns true (1) if this View is valid. /// Returns true (1) if this View is valid.
/// ///
int(CEF_CALLBACK* is_valid)(struct _cef_view_t* self); int(CEF_CALLBACK* is_valid)(struct _cef_view_t* self);
/// ///
// Returns true (1) if this View is currently attached to another View. A View /// Returns true (1) if this View is currently attached to another View. A
// can only be attached to one View at a time. /// View can only be attached to one View at a time.
/// ///
int(CEF_CALLBACK* is_attached)(struct _cef_view_t* self); int(CEF_CALLBACK* is_attached)(struct _cef_view_t* self);
/// ///
// Returns true (1) if this View is the same as |that| View. /// Returns true (1) if this View is the same as |that| View.
/// ///
int(CEF_CALLBACK* is_same)(struct _cef_view_t* self, int(CEF_CALLBACK* is_same)(struct _cef_view_t* self,
struct _cef_view_t* that); struct _cef_view_t* that);
/// ///
// Returns the delegate associated with this View, if any. /// Returns the delegate associated with this View, if any.
/// ///
struct _cef_view_delegate_t*(CEF_CALLBACK* get_delegate)( struct _cef_view_delegate_t*(CEF_CALLBACK* get_delegate)(
struct _cef_view_t* self); struct _cef_view_t* self);
/// ///
// Returns the top-level Window hosting this View, if any. /// Returns the top-level Window hosting this View, if any.
/// ///
struct _cef_window_t*(CEF_CALLBACK* get_window)(struct _cef_view_t* self); struct _cef_window_t*(CEF_CALLBACK* get_window)(struct _cef_view_t* self);
/// ///
// Returns the ID for this View. /// Returns the ID for this View.
/// ///
int(CEF_CALLBACK* get_id)(struct _cef_view_t* self); int(CEF_CALLBACK* get_id)(struct _cef_view_t* self);
/// ///
// Sets the ID for this View. ID should be unique within the subtree that you /// Sets the ID for this View. ID should be unique within the subtree that you
// intend to search for it. 0 is the default ID for views. /// intend to search for it. 0 is the default ID for views.
/// ///
void(CEF_CALLBACK* set_id)(struct _cef_view_t* self, int id); void(CEF_CALLBACK* set_id)(struct _cef_view_t* self, int id);
/// ///
// Returns the group id of this View, or -1 if not set. /// Returns the group id of this View, or -1 if not set.
/// ///
int(CEF_CALLBACK* get_group_id)(struct _cef_view_t* self); int(CEF_CALLBACK* get_group_id)(struct _cef_view_t* self);
/// ///
// A group id is used to tag Views which are part of the same logical group. /// A group id is used to tag Views which are part of the same logical group.
// Focus can be moved between views with the same group using the arrow keys. /// Focus can be moved between views with the same group using the arrow keys.
// The group id is immutable once it's set. /// The group id is immutable once it's set.
/// ///
void(CEF_CALLBACK* set_group_id)(struct _cef_view_t* self, int group_id); void(CEF_CALLBACK* set_group_id)(struct _cef_view_t* self, int group_id);
/// ///
// Returns the View that contains this View, if any. /// Returns the View that contains this View, if any.
/// ///
struct _cef_view_t*(CEF_CALLBACK* get_parent_view)(struct _cef_view_t* self); struct _cef_view_t*(CEF_CALLBACK* get_parent_view)(struct _cef_view_t* self);
/// ///
// Recursively descends the view tree starting at this View, and returns the /// Recursively descends the view tree starting at this View, and returns the
// first child that it encounters with the given ID. Returns NULL if no /// first child that it encounters with the given ID. Returns NULL if no
// matching child view is found. /// matching child view is found.
/// ///
struct _cef_view_t*(CEF_CALLBACK* get_view_for_id)(struct _cef_view_t* self, struct _cef_view_t*(CEF_CALLBACK* get_view_for_id)(struct _cef_view_t* self,
int id); int id);
/// ///
// Sets the bounds (size and position) of this View. |bounds| is in parent /// Sets the bounds (size and position) of this View. |bounds| is in parent
// coordinates, or DIP screen coordinates if there is no parent. /// coordinates, or DIP screen coordinates if there is no parent.
/// ///
void(CEF_CALLBACK* set_bounds)(struct _cef_view_t* self, void(CEF_CALLBACK* set_bounds)(struct _cef_view_t* self,
const cef_rect_t* bounds); const cef_rect_t* bounds);
/// ///
// Returns the bounds (size and position) of this View in parent coordinates, /// Returns the bounds (size and position) of this View in parent coordinates,
// or DIP screen coordinates if there is no parent. /// or DIP screen coordinates if there is no parent.
/// ///
cef_rect_t(CEF_CALLBACK* get_bounds)(struct _cef_view_t* self); cef_rect_t(CEF_CALLBACK* get_bounds)(struct _cef_view_t* self);
/// ///
// Returns the bounds (size and position) of this View in DIP screen /// Returns the bounds (size and position) of this View in DIP screen
// coordinates. /// coordinates.
/// ///
cef_rect_t(CEF_CALLBACK* get_bounds_in_screen)(struct _cef_view_t* self); cef_rect_t(CEF_CALLBACK* get_bounds_in_screen)(struct _cef_view_t* self);
/// ///
// Sets the size of this View without changing the position. |size| in parent /// Sets the size of this View without changing the position. |size| in parent
// coordinates, or DIP screen coordinates if there is no parent. /// coordinates, or DIP screen coordinates if there is no parent.
/// ///
void(CEF_CALLBACK* set_size)(struct _cef_view_t* self, void(CEF_CALLBACK* set_size)(struct _cef_view_t* self,
const cef_size_t* size); const cef_size_t* size);
/// ///
// Returns the size of this View in parent coordinates, or DIP screen /// Returns the size of this View in parent coordinates, or DIP screen
// coordinates if there is no parent. /// coordinates if there is no parent.
/// ///
cef_size_t(CEF_CALLBACK* get_size)(struct _cef_view_t* self); cef_size_t(CEF_CALLBACK* get_size)(struct _cef_view_t* self);
/// ///
// Sets the position of this View without changing the size. |position| is in /// Sets the position of this View without changing the size. |position| is in
// parent coordinates, or DIP screen coordinates if there is no parent. /// parent coordinates, or DIP screen coordinates if there is no parent.
/// ///
void(CEF_CALLBACK* set_position)(struct _cef_view_t* self, void(CEF_CALLBACK* set_position)(struct _cef_view_t* self,
const cef_point_t* position); const cef_point_t* position);
/// ///
// Returns the position of this View. Position is in parent coordinates, or /// Returns the position of this View. Position is in parent coordinates, or
// DIP screen coordinates if there is no parent. /// DIP screen coordinates if there is no parent.
/// ///
cef_point_t(CEF_CALLBACK* get_position)(struct _cef_view_t* self); cef_point_t(CEF_CALLBACK* get_position)(struct _cef_view_t* self);
/// ///
// Sets the insets for this View. |insets| is in parent coordinates, or DIP /// Sets the insets for this View. |insets| is in parent coordinates, or DIP
// screen coordinates if there is no parent. /// screen coordinates if there is no parent.
/// ///
void(CEF_CALLBACK* set_insets)(struct _cef_view_t* self, void(CEF_CALLBACK* set_insets)(struct _cef_view_t* self,
const cef_insets_t* insets); const cef_insets_t* insets);
/// ///
// Returns the insets for this View in parent coordinates, or DIP screen /// Returns the insets for this View in parent coordinates, or DIP screen
// coordinates if there is no parent. /// coordinates if there is no parent.
/// ///
cef_insets_t(CEF_CALLBACK* get_insets)(struct _cef_view_t* self); cef_insets_t(CEF_CALLBACK* get_insets)(struct _cef_view_t* self);
/// ///
// Returns the size this View would like to be if enough space is available. /// Returns the size this View would like to be if enough space is available.
// Size is in parent coordinates, or DIP screen coordinates if there is no /// Size is in parent coordinates, or DIP screen coordinates if there is no
// parent. /// parent.
/// ///
cef_size_t(CEF_CALLBACK* get_preferred_size)(struct _cef_view_t* self); cef_size_t(CEF_CALLBACK* get_preferred_size)(struct _cef_view_t* self);
/// ///
// Size this View to its preferred size. Size is in parent coordinates, or DIP /// Size this View to its preferred size. Size is in parent coordinates, or
// screen coordinates if there is no parent. /// DIP screen coordinates if there is no parent.
/// ///
void(CEF_CALLBACK* size_to_preferred_size)(struct _cef_view_t* self); void(CEF_CALLBACK* size_to_preferred_size)(struct _cef_view_t* self);
/// ///
// Returns the minimum size for this View. Size is in parent coordinates, or /// Returns the minimum size for this View. Size is in parent coordinates, or
// DIP screen coordinates if there is no parent. /// DIP screen coordinates if there is no parent.
/// ///
cef_size_t(CEF_CALLBACK* get_minimum_size)(struct _cef_view_t* self); cef_size_t(CEF_CALLBACK* get_minimum_size)(struct _cef_view_t* self);
/// ///
// Returns the maximum size for this View. Size is in parent coordinates, or /// Returns the maximum size for this View. Size is in parent coordinates, or
// DIP screen coordinates if there is no parent. /// DIP screen coordinates if there is no parent.
/// ///
cef_size_t(CEF_CALLBACK* get_maximum_size)(struct _cef_view_t* self); cef_size_t(CEF_CALLBACK* get_maximum_size)(struct _cef_view_t* self);
/// ///
// Returns the height necessary to display this View with the provided width. /// Returns the height necessary to display this View with the provided width.
/// ///
int(CEF_CALLBACK* get_height_for_width)(struct _cef_view_t* self, int width); int(CEF_CALLBACK* get_height_for_width)(struct _cef_view_t* self, int width);
/// ///
// Indicate that this View and all parent Views require a re-layout. This /// Indicate that this View and all parent Views require a re-layout. This
// ensures the next call to layout() will propagate to this View even if the /// ensures the next call to layout() will propagate to this View even if the
// bounds of parent Views do not change. /// bounds of parent Views do not change.
/// ///
void(CEF_CALLBACK* invalidate_layout)(struct _cef_view_t* self); void(CEF_CALLBACK* invalidate_layout)(struct _cef_view_t* self);
/// ///
// Sets whether this View is visible. Windows are hidden by default and other /// Sets whether this View is visible. Windows are hidden by default and other
// views are visible by default. This View and any parent views must be set as /// views are visible by default. This View and any parent views must be set
// visible for this View to be drawn in a Window. If this View is set as /// as visible for this View to be drawn in a Window. If this View is set as
// hidden then it and any child views will not be drawn and, if any of those /// hidden then it and any child views will not be drawn and, if any of those
// views currently have focus, then focus will also be cleared. Painting is /// views currently have focus, then focus will also be cleared. Painting is
// scheduled as needed. If this View is a Window then calling this function is /// scheduled as needed. If this View is a Window then calling this function
// equivalent to calling the Window show() and hide() functions. /// is equivalent to calling the Window show() and hide() functions.
/// ///
void(CEF_CALLBACK* set_visible)(struct _cef_view_t* self, int visible); void(CEF_CALLBACK* set_visible)(struct _cef_view_t* self, int visible);
/// ///
// Returns whether this View is visible. A view may be visible but still not /// Returns whether this View is visible. A view may be visible but still not
// drawn in a Window if any parent views are hidden. If this View is a Window /// drawn in a Window if any parent views are hidden. If this View is a Window
// then a return value of true (1) indicates that this Window is currently /// then a return value of true (1) indicates that this Window is currently
// visible to the user on-screen. If this View is not a Window then call /// visible to the user on-screen. If this View is not a Window then call
// is_drawn() to determine whether this View and all parent views are visible /// is_drawn() to determine whether this View and all parent views are visible
// and will be drawn. /// and will be drawn.
/// ///
int(CEF_CALLBACK* is_visible)(struct _cef_view_t* self); int(CEF_CALLBACK* is_visible)(struct _cef_view_t* self);
/// ///
// Returns whether this View is visible and drawn in a Window. A view is drawn /// Returns whether this View is visible and drawn in a Window. A view is
// if it and all parent views are visible. If this View is a Window then /// drawn if it and all parent views are visible. If this View is a Window
// calling this function is equivalent to calling is_visible(). Otherwise, to /// then calling this function is equivalent to calling is_visible().
// determine if the containing Window is visible to the user on-screen call /// Otherwise, to determine if the containing Window is visible to the user
// is_visible() on the Window. /// on-screen call is_visible() on the Window.
/// ///
int(CEF_CALLBACK* is_drawn)(struct _cef_view_t* self); int(CEF_CALLBACK* is_drawn)(struct _cef_view_t* self);
/// ///
// Set whether this View is enabled. A disabled View does not receive keyboard /// Set whether this View is enabled. A disabled View does not receive
// or mouse inputs. If |enabled| differs from the current value the View will /// keyboard or mouse inputs. If |enabled| differs from the current value the
// be repainted. Also, clears focus if the focused View is disabled. /// View will be repainted. Also, clears focus if the focused View is
/// disabled.
/// ///
void(CEF_CALLBACK* set_enabled)(struct _cef_view_t* self, int enabled); void(CEF_CALLBACK* set_enabled)(struct _cef_view_t* self, int enabled);
/// ///
// Returns whether this View is enabled. /// Returns whether this View is enabled.
/// ///
int(CEF_CALLBACK* is_enabled)(struct _cef_view_t* self); int(CEF_CALLBACK* is_enabled)(struct _cef_view_t* self);
/// ///
// Sets whether this View is capable of taking focus. It will clear focus if /// Sets whether this View is capable of taking focus. It will clear focus if
// the focused View is set to be non-focusable. This is false (0) by default /// the focused View is set to be non-focusable. This is false (0) by default
// so that a View used as a container does not get the focus. /// so that a View used as a container does not get the focus.
/// ///
void(CEF_CALLBACK* set_focusable)(struct _cef_view_t* self, int focusable); void(CEF_CALLBACK* set_focusable)(struct _cef_view_t* self, int focusable);
/// ///
// Returns true (1) if this View is focusable, enabled and drawn. /// Returns true (1) if this View is focusable, enabled and drawn.
/// ///
int(CEF_CALLBACK* is_focusable)(struct _cef_view_t* self); int(CEF_CALLBACK* is_focusable)(struct _cef_view_t* self);
/// ///
// Return whether this View is focusable when the user requires full keyboard /// Return whether this View is focusable when the user requires full keyboard
// access, even though it may not be normally focusable. /// access, even though it may not be normally focusable.
/// ///
int(CEF_CALLBACK* is_accessibility_focusable)(struct _cef_view_t* self); int(CEF_CALLBACK* is_accessibility_focusable)(struct _cef_view_t* self);
/// ///
// Request keyboard focus. If this View is focusable it will become the /// Request keyboard focus. If this View is focusable it will become the
// focused View. /// focused View.
/// ///
void(CEF_CALLBACK* request_focus)(struct _cef_view_t* self); void(CEF_CALLBACK* request_focus)(struct _cef_view_t* self);
/// ///
// Sets the background color for this View. /// Sets the background color for this View.
/// ///
void(CEF_CALLBACK* set_background_color)(struct _cef_view_t* self, void(CEF_CALLBACK* set_background_color)(struct _cef_view_t* self,
cef_color_t color); cef_color_t color);
/// ///
// Returns the background color for this View. /// Returns the background color for this View.
/// ///
cef_color_t(CEF_CALLBACK* get_background_color)(struct _cef_view_t* self); cef_color_t(CEF_CALLBACK* get_background_color)(struct _cef_view_t* self);
/// ///
// Convert |point| from this View's coordinate system to DIP screen /// Convert |point| from this View's coordinate system to DIP screen
// coordinates. This View must belong to a Window when calling this function. /// coordinates. This View must belong to a Window when calling this function.
// Returns true (1) if the conversion is successful or false (0) otherwise. /// Returns true (1) if the conversion is successful or false (0) otherwise.
// Use cef_display_t::convert_point_to_pixels() after calling this function if /// Use cef_display_t::convert_point_to_pixels() after calling this function
// further conversion to display-specific pixel coordinates is desired. /// if further conversion to display-specific pixel coordinates is desired.
/// ///
int(CEF_CALLBACK* convert_point_to_screen)(struct _cef_view_t* self, int(CEF_CALLBACK* convert_point_to_screen)(struct _cef_view_t* self,
cef_point_t* point); cef_point_t* point);
/// ///
// Convert |point| to this View's coordinate system from DIP screen /// Convert |point| to this View's coordinate system from DIP screen
// coordinates. This View must belong to a Window when calling this function. /// coordinates. This View must belong to a Window when calling this function.
// Returns true (1) if the conversion is successful or false (0) otherwise. /// Returns true (1) if the conversion is successful or false (0) otherwise.
// Use cef_display_t::convert_point_from_pixels() before calling this function /// Use cef_display_t::convert_point_from_pixels() before calling this
// if conversion from display-specific pixel coordinates is necessary. /// function if conversion from display-specific pixel coordinates is
/// necessary.
/// ///
int(CEF_CALLBACK* convert_point_from_screen)(struct _cef_view_t* self, int(CEF_CALLBACK* convert_point_from_screen)(struct _cef_view_t* self,
cef_point_t* point); cef_point_t* point);
/// ///
// Convert |point| from this View's coordinate system to that of the Window. /// Convert |point| from this View's coordinate system to that of the Window.
// This View must belong to a Window when calling this function. Returns true /// This View must belong to a Window when calling this function. Returns true
// (1) if the conversion is successful or false (0) otherwise. /// (1) if the conversion is successful or false (0) otherwise.
/// ///
int(CEF_CALLBACK* convert_point_to_window)(struct _cef_view_t* self, int(CEF_CALLBACK* convert_point_to_window)(struct _cef_view_t* self,
cef_point_t* point); cef_point_t* point);
/// ///
// Convert |point| to this View's coordinate system from that of the Window. /// Convert |point| to this View's coordinate system from that of the Window.
// This View must belong to a Window when calling this function. Returns true /// This View must belong to a Window when calling this function. Returns true
// (1) if the conversion is successful or false (0) otherwise. /// (1) if the conversion is successful or false (0) otherwise.
/// ///
int(CEF_CALLBACK* convert_point_from_window)(struct _cef_view_t* self, int(CEF_CALLBACK* convert_point_from_window)(struct _cef_view_t* self,
cef_point_t* point); cef_point_t* point);
/// ///
// Convert |point| from this View's coordinate system to that of |view|. /// Convert |point| from this View's coordinate system to that of |view|.
// |view| needs to be in the same Window but not necessarily the same view /// |view| needs to be in the same Window but not necessarily the same view
// hierarchy. Returns true (1) if the conversion is successful or false (0) /// hierarchy. Returns true (1) if the conversion is successful or false (0)
// otherwise. /// otherwise.
/// ///
int(CEF_CALLBACK* convert_point_to_view)(struct _cef_view_t* self, int(CEF_CALLBACK* convert_point_to_view)(struct _cef_view_t* self,
struct _cef_view_t* view, struct _cef_view_t* view,
cef_point_t* point); cef_point_t* point);
/// ///
// Convert |point| to this View's coordinate system from that |view|. |view| /// Convert |point| to this View's coordinate system from that |view|. |view|
// needs to be in the same Window but not necessarily the same view hierarchy. /// needs to be in the same Window but not necessarily the same view
// Returns true (1) if the conversion is successful or false (0) otherwise. /// hierarchy. Returns true (1) if the conversion is successful or false (0)
/// otherwise.
/// ///
int(CEF_CALLBACK* convert_point_from_view)(struct _cef_view_t* self, int(CEF_CALLBACK* convert_point_from_view)(struct _cef_view_t* self,
struct _cef_view_t* view, struct _cef_view_t* view,

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=a75487288913e4646f67ee8aded4bc9ef328bb79$ // $hash=41b9addf8d38cc522879ba1abd455325e7f98bc4$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_VIEW_DELEGATE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_VIEW_DELEGATE_CAPI_H_
@ -49,53 +49,53 @@ extern "C" {
struct _cef_view_t; struct _cef_view_t;
/// ///
// Implement this structure to handle view events. All size and position values /// Implement this structure to handle view events. All size and position values
// are in density independent pixels (DIP) unless otherwise indicated. The /// are in density independent pixels (DIP) unless otherwise indicated. The
// functions of this structure will be called on the browser process UI thread /// functions of this structure will be called on the browser process UI thread
// unless otherwise indicated. /// unless otherwise indicated.
/// ///
typedef struct _cef_view_delegate_t { typedef struct _cef_view_delegate_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_base_ref_counted_t base; cef_base_ref_counted_t base;
/// ///
// Return the preferred size for |view|. The Layout will use this information /// Return the preferred size for |view|. The Layout will use this information
// to determine the display size. /// to determine the display size.
/// ///
cef_size_t(CEF_CALLBACK* get_preferred_size)( cef_size_t(CEF_CALLBACK* get_preferred_size)(
struct _cef_view_delegate_t* self, struct _cef_view_delegate_t* self,
struct _cef_view_t* view); struct _cef_view_t* view);
/// ///
// Return the minimum size for |view|. /// Return the minimum size for |view|.
/// ///
cef_size_t(CEF_CALLBACK* get_minimum_size)(struct _cef_view_delegate_t* self, cef_size_t(CEF_CALLBACK* get_minimum_size)(struct _cef_view_delegate_t* self,
struct _cef_view_t* view); struct _cef_view_t* view);
/// ///
// Return the maximum size for |view|. /// Return the maximum size for |view|.
/// ///
cef_size_t(CEF_CALLBACK* get_maximum_size)(struct _cef_view_delegate_t* self, cef_size_t(CEF_CALLBACK* get_maximum_size)(struct _cef_view_delegate_t* self,
struct _cef_view_t* view); struct _cef_view_t* view);
/// ///
// Return the height necessary to display |view| with the provided |width|. If /// Return the height necessary to display |view| with the provided |width|.
// not specified the result of get_preferred_size().height will be used by /// If not specified the result of get_preferred_size().height will be used by
// default. Override if |view|'s preferred height depends upon the width (for /// default. Override if |view|'s preferred height depends upon the width (for
// example, with Labels). /// example, with Labels).
/// ///
int(CEF_CALLBACK* get_height_for_width)(struct _cef_view_delegate_t* self, int(CEF_CALLBACK* get_height_for_width)(struct _cef_view_delegate_t* self,
struct _cef_view_t* view, struct _cef_view_t* view,
int width); int width);
/// ///
// Called when the parent of |view| has changed. If |view| is being added to /// Called when the parent of |view| has changed. If |view| is being added to
// |parent| then |added| will be true (1). If |view| is being removed from /// |parent| then |added| will be true (1). If |view| is being removed from
// |parent| then |added| will be false (0). If |view| is being reparented the /// |parent| then |added| will be false (0). If |view| is being reparented the
// remove notification will be sent before the add notification. Do not modify /// remove notification will be sent before the add notification. Do not
// the view hierarchy in this callback. /// modify the view hierarchy in this callback.
/// ///
void(CEF_CALLBACK* on_parent_view_changed)(struct _cef_view_delegate_t* self, void(CEF_CALLBACK* on_parent_view_changed)(struct _cef_view_delegate_t* self,
struct _cef_view_t* view, struct _cef_view_t* view,
@ -103,12 +103,12 @@ typedef struct _cef_view_delegate_t {
struct _cef_view_t* parent); struct _cef_view_t* parent);
/// ///
// Called when a child of |view| has changed. If |child| is being added to /// Called when a child of |view| has changed. If |child| is being added to
// |view| then |added| will be true (1). If |child| is being removed from /// |view| then |added| will be true (1). If |child| is being removed from
// |view| then |added| will be false (0). If |child| is being reparented the /// |view| then |added| will be false (0). If |child| is being reparented the
// remove notification will be sent to the old parent before the add /// remove notification will be sent to the old parent before the add
// notification is sent to the new parent. Do not modify the view hierarchy in /// notification is sent to the new parent. Do not modify the view hierarchy
// this callback. /// in this callback.
/// ///
void(CEF_CALLBACK* on_child_view_changed)(struct _cef_view_delegate_t* self, void(CEF_CALLBACK* on_child_view_changed)(struct _cef_view_delegate_t* self,
struct _cef_view_t* view, struct _cef_view_t* view,
@ -116,27 +116,27 @@ typedef struct _cef_view_delegate_t {
struct _cef_view_t* child); struct _cef_view_t* child);
/// ///
// Called when |view| is added or removed from the cef_window_t. /// Called when |view| is added or removed from the cef_window_t.
/// ///
void(CEF_CALLBACK* on_window_changed)(struct _cef_view_delegate_t* self, void(CEF_CALLBACK* on_window_changed)(struct _cef_view_delegate_t* self,
struct _cef_view_t* view, struct _cef_view_t* view,
int added); int added);
/// ///
// Called when the layout of |view| has changed. /// Called when the layout of |view| has changed.
/// ///
void(CEF_CALLBACK* on_layout_changed)(struct _cef_view_delegate_t* self, void(CEF_CALLBACK* on_layout_changed)(struct _cef_view_delegate_t* self,
struct _cef_view_t* view, struct _cef_view_t* view,
const cef_rect_t* new_bounds); const cef_rect_t* new_bounds);
/// ///
// Called when |view| gains focus. /// Called when |view| gains focus.
/// ///
void(CEF_CALLBACK* on_focus)(struct _cef_view_delegate_t* self, void(CEF_CALLBACK* on_focus)(struct _cef_view_delegate_t* self,
struct _cef_view_t* view); struct _cef_view_t* view);
/// ///
// Called when |view| loses focus. /// Called when |view| loses focus.
/// ///
void(CEF_CALLBACK* on_blur)(struct _cef_view_delegate_t* self, void(CEF_CALLBACK* on_blur)(struct _cef_view_delegate_t* self,
struct _cef_view_t* view); struct _cef_view_t* view);

View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=1785245d89e84d5a27ce062208bc19a4031ce97f$ // $hash=ba3a92d4e09b2f728b330a822669c64ddff1f9d6$
// //
#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_WINDOW_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_WINDOW_CAPI_H_
@ -52,180 +52,180 @@ extern "C" {
#endif #endif
/// ///
// A Window is a top-level Window/widget in the Views hierarchy. By default it /// A Window is a top-level Window/widget in the Views hierarchy. By default it
// will have a non-client area with title bar, icon and buttons that supports /// will have a non-client area with title bar, icon and buttons that supports
// moving and resizing. All size and position values are in density independent /// moving and resizing. All size and position values are in density independent
// pixels (DIP) unless otherwise indicated. Methods must be called on the /// pixels (DIP) unless otherwise indicated. Methods must be called on the
// browser process UI thread unless otherwise indicated. /// browser process UI thread unless otherwise indicated.
/// ///
typedef struct _cef_window_t { typedef struct _cef_window_t {
/// ///
// Base structure. /// Base structure.
/// ///
cef_panel_t base; cef_panel_t base;
/// ///
// Show the Window. /// Show the Window.
/// ///
void(CEF_CALLBACK* show)(struct _cef_window_t* self); void(CEF_CALLBACK* show)(struct _cef_window_t* self);
/// ///
// Hide the Window. /// Hide the Window.
/// ///
void(CEF_CALLBACK* hide)(struct _cef_window_t* self); void(CEF_CALLBACK* hide)(struct _cef_window_t* self);
/// ///
// Sizes the Window to |size| and centers it in the current display. /// Sizes the Window to |size| and centers it in the current display.
/// ///
void(CEF_CALLBACK* center_window)(struct _cef_window_t* self, void(CEF_CALLBACK* center_window)(struct _cef_window_t* self,
const cef_size_t* size); const cef_size_t* size);
/// ///
// Close the Window. /// Close the Window.
/// ///
void(CEF_CALLBACK* close)(struct _cef_window_t* self); void(CEF_CALLBACK* close)(struct _cef_window_t* self);
/// ///
// Returns true (1) if the Window has been closed. /// Returns true (1) if the Window has been closed.
/// ///
int(CEF_CALLBACK* is_closed)(struct _cef_window_t* self); int(CEF_CALLBACK* is_closed)(struct _cef_window_t* self);
/// ///
// Activate the Window, assuming it already exists and is visible. /// Activate the Window, assuming it already exists and is visible.
/// ///
void(CEF_CALLBACK* activate)(struct _cef_window_t* self); void(CEF_CALLBACK* activate)(struct _cef_window_t* self);
/// ///
// Deactivate the Window, making the next Window in the Z order the active /// Deactivate the Window, making the next Window in the Z order the active
// Window. /// Window.
/// ///
void(CEF_CALLBACK* deactivate)(struct _cef_window_t* self); void(CEF_CALLBACK* deactivate)(struct _cef_window_t* self);
/// ///
// Returns whether the Window is the currently active Window. /// Returns whether the Window is the currently active Window.
/// ///
int(CEF_CALLBACK* is_active)(struct _cef_window_t* self); int(CEF_CALLBACK* is_active)(struct _cef_window_t* self);
/// ///
// Bring this Window to the top of other Windows in the Windowing system. /// Bring this Window to the top of other Windows in the Windowing system.
/// ///
void(CEF_CALLBACK* bring_to_top)(struct _cef_window_t* self); void(CEF_CALLBACK* bring_to_top)(struct _cef_window_t* self);
/// ///
// Set the Window to be on top of other Windows in the Windowing system. /// Set the Window to be on top of other Windows in the Windowing system.
/// ///
void(CEF_CALLBACK* set_always_on_top)(struct _cef_window_t* self, int on_top); void(CEF_CALLBACK* set_always_on_top)(struct _cef_window_t* self, int on_top);
/// ///
// Returns whether the Window has been set to be on top of other Windows in /// Returns whether the Window has been set to be on top of other Windows in
// the Windowing system. /// the Windowing system.
/// ///
int(CEF_CALLBACK* is_always_on_top)(struct _cef_window_t* self); int(CEF_CALLBACK* is_always_on_top)(struct _cef_window_t* self);
/// ///
// Maximize the Window. /// Maximize the Window.
/// ///
void(CEF_CALLBACK* maximize)(struct _cef_window_t* self); void(CEF_CALLBACK* maximize)(struct _cef_window_t* self);
/// ///
// Minimize the Window. /// Minimize the Window.
/// ///
void(CEF_CALLBACK* minimize)(struct _cef_window_t* self); void(CEF_CALLBACK* minimize)(struct _cef_window_t* self);
/// ///
// Restore the Window. /// Restore the Window.
/// ///
void(CEF_CALLBACK* restore)(struct _cef_window_t* self); void(CEF_CALLBACK* restore)(struct _cef_window_t* self);
/// ///
// Set fullscreen Window state. /// Set fullscreen Window state.
/// ///
void(CEF_CALLBACK* set_fullscreen)(struct _cef_window_t* self, void(CEF_CALLBACK* set_fullscreen)(struct _cef_window_t* self,
int fullscreen); int fullscreen);
/// ///
// Returns true (1) if the Window is maximized. /// Returns true (1) if the Window is maximized.
/// ///
int(CEF_CALLBACK* is_maximized)(struct _cef_window_t* self); int(CEF_CALLBACK* is_maximized)(struct _cef_window_t* self);
/// ///
// Returns true (1) if the Window is minimized. /// Returns true (1) if the Window is minimized.
/// ///
int(CEF_CALLBACK* is_minimized)(struct _cef_window_t* self); int(CEF_CALLBACK* is_minimized)(struct _cef_window_t* self);
/// ///
// Returns true (1) if the Window is fullscreen. /// Returns true (1) if the Window is fullscreen.
/// ///
int(CEF_CALLBACK* is_fullscreen)(struct _cef_window_t* self); int(CEF_CALLBACK* is_fullscreen)(struct _cef_window_t* self);
/// ///
// Set the Window title. /// Set the Window title.
/// ///
void(CEF_CALLBACK* set_title)(struct _cef_window_t* self, void(CEF_CALLBACK* set_title)(struct _cef_window_t* self,
const cef_string_t* title); const cef_string_t* title);
/// ///
// Get the Window title. /// Get the Window title.
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t(CEF_CALLBACK* get_title)(struct _cef_window_t* self); cef_string_userfree_t(CEF_CALLBACK* get_title)(struct _cef_window_t* self);
/// ///
// Set the Window icon. This should be a 16x16 icon suitable for use in the /// Set the Window icon. This should be a 16x16 icon suitable for use in the
// Windows's title bar. /// Windows's title bar.
/// ///
void(CEF_CALLBACK* set_window_icon)(struct _cef_window_t* self, void(CEF_CALLBACK* set_window_icon)(struct _cef_window_t* self,
struct _cef_image_t* image); struct _cef_image_t* image);
/// ///
// Get the Window icon. /// Get the Window icon.
/// ///
struct _cef_image_t*(CEF_CALLBACK* get_window_icon)( struct _cef_image_t*(CEF_CALLBACK* get_window_icon)(
struct _cef_window_t* self); struct _cef_window_t* self);
/// ///
// Set the Window App icon. This should be a larger icon for use in the host /// Set the Window App icon. This should be a larger icon for use in the host
// environment app switching UI. On Windows, this is the ICON_BIG used in Alt- /// environment app switching UI. On Windows, this is the ICON_BIG used in
// Tab list and Windows taskbar. The Window icon will be used by default if no /// Alt-Tab list and Windows taskbar. The Window icon will be used by default
// Window App icon is specified. /// if no Window App icon is specified.
/// ///
void(CEF_CALLBACK* set_window_app_icon)(struct _cef_window_t* self, void(CEF_CALLBACK* set_window_app_icon)(struct _cef_window_t* self,
struct _cef_image_t* image); struct _cef_image_t* image);
/// ///
// Get the Window App icon. /// Get the Window App icon.
/// ///
struct _cef_image_t*(CEF_CALLBACK* get_window_app_icon)( struct _cef_image_t*(CEF_CALLBACK* get_window_app_icon)(
struct _cef_window_t* self); struct _cef_window_t* self);
/// ///
// Add a View that will be overlayed on the Window contents with absolute /// Add a View that will be overlayed on the Window contents with absolute
// positioning and high z-order. Positioning is controlled by |docking_mode| /// positioning and high z-order. Positioning is controlled by |docking_mode|
// as described below. The returned cef_overlay_controller_t object is used to /// as described below. The returned cef_overlay_controller_t object is used
// control the overlay. Overlays are hidden by default. /// to control the overlay. Overlays are hidden by default.
// ///
// With CEF_DOCKING_MODE_CUSTOM: /// With CEF_DOCKING_MODE_CUSTOM:
// 1. The overlay is initially hidden, sized to |view|'s preferred size, and /// 1. The overlay is initially hidden, sized to |view|'s preferred size,
// positioned in the top-left corner. /// and positioned in the top-left corner.
// 2. Optionally change the overlay position and/or size by calling /// 2. Optionally change the overlay position and/or size by calling
// CefOverlayController methods. /// CefOverlayController methods.
// 3. Call CefOverlayController::SetVisible(true) to show the overlay. /// 3. Call CefOverlayController::SetVisible(true) to show the overlay.
// 4. The overlay will be automatically re-sized if |view|'s layout changes. /// 4. The overlay will be automatically re-sized if |view|'s layout
// Optionally change the overlay position and/or size when /// changes. Optionally change the overlay position and/or size when
// OnLayoutChanged is called on the Window's delegate to indicate a /// OnLayoutChanged is called on the Window's delegate to indicate a
// change in Window bounds. /// change in Window bounds.
// ///
// With other docking modes: /// With other docking modes:
// 1. The overlay is initially hidden, sized to |view|'s preferred size, and /// 1. The overlay is initially hidden, sized to |view|'s preferred size,
// positioned based on |docking_mode|. /// and positioned based on |docking_mode|.
// 2. Call CefOverlayController::SetVisible(true) to show the overlay. /// 2. Call CefOverlayController::SetVisible(true) to show the overlay.
// 3. The overlay will be automatically re-sized if |view|'s layout changes /// 3. The overlay will be automatically re-sized if |view|'s layout changes
// and re-positioned as appropriate when the Window resizes. /// and re-positioned as appropriate when the Window resizes.
// ///
// Overlays created by this function will receive a higher z-order then any /// Overlays created by this function will receive a higher z-order then any
// child Views added previously. It is therefore recommended to call this /// child Views added previously. It is therefore recommended to call this
// function last after all other child Views have been added so that the /// function last after all other child Views have been added so that the
// overlay displays as the top-most child of the Window. /// overlay displays as the top-most child of the Window.
/// ///
struct _cef_overlay_controller_t*(CEF_CALLBACK* add_overlay_view)( struct _cef_overlay_controller_t*(CEF_CALLBACK* add_overlay_view)(
struct _cef_window_t* self, struct _cef_window_t* self,
@ -233,9 +233,9 @@ typedef struct _cef_window_t {
cef_docking_mode_t docking_mode); cef_docking_mode_t docking_mode);
/// ///
// Show a menu with contents |menu_model|. |screen_point| specifies the menu /// Show a menu with contents |menu_model|. |screen_point| specifies the menu
// position in screen coordinates. |anchor_position| specifies how the menu /// position in screen coordinates. |anchor_position| specifies how the menu
// will be anchored relative to |screen_point|. /// will be anchored relative to |screen_point|.
/// ///
void(CEF_CALLBACK* show_menu)(struct _cef_window_t* self, void(CEF_CALLBACK* show_menu)(struct _cef_window_t* self,
struct _cef_menu_model_t* menu_model, struct _cef_menu_model_t* menu_model,
@ -243,28 +243,28 @@ typedef struct _cef_window_t {
cef_menu_anchor_position_t anchor_position); cef_menu_anchor_position_t anchor_position);
/// ///
// Cancel the menu that is currently showing, if any. /// Cancel the menu that is currently showing, if any.
/// ///
void(CEF_CALLBACK* cancel_menu)(struct _cef_window_t* self); void(CEF_CALLBACK* cancel_menu)(struct _cef_window_t* self);
/// ///
// Returns the Display that most closely intersects the bounds of this Window. /// Returns the Display that most closely intersects the bounds of this
// May return NULL if this Window is not currently displayed. /// Window. May return NULL if this Window is not currently displayed.
/// ///
struct _cef_display_t*(CEF_CALLBACK* get_display)(struct _cef_window_t* self); struct _cef_display_t*(CEF_CALLBACK* get_display)(struct _cef_window_t* self);
/// ///
// Returns the bounds (size and position) of this Window's client area. /// Returns the bounds (size and position) of this Window's client area.
// Position is in screen coordinates. /// Position is in screen coordinates.
/// ///
cef_rect_t(CEF_CALLBACK* get_client_area_bounds_in_screen)( cef_rect_t(CEF_CALLBACK* get_client_area_bounds_in_screen)(
struct _cef_window_t* self); struct _cef_window_t* self);
/// ///
// Set the regions where mouse events will be intercepted by this Window to /// Set the regions where mouse events will be intercepted by this Window to
// support drag operations. Call this function with an NULL vector to clear /// support drag operations. Call this function with an NULL vector to clear
// the draggable regions. The draggable region bounds should be in window /// the draggable regions. The draggable region bounds should be in window
// coordinates. /// coordinates.
/// ///
void(CEF_CALLBACK* set_draggable_regions)( void(CEF_CALLBACK* set_draggable_regions)(
struct _cef_window_t* self, struct _cef_window_t* self,
@ -272,39 +272,39 @@ typedef struct _cef_window_t {
cef_draggable_region_t const* regions); cef_draggable_region_t const* regions);
/// ///
// Retrieve the platform window handle for this Window. /// Retrieve the platform window handle for this Window.
/// ///
cef_window_handle_t(CEF_CALLBACK* get_window_handle)( cef_window_handle_t(CEF_CALLBACK* get_window_handle)(
struct _cef_window_t* self); struct _cef_window_t* self);
/// ///
// Simulate a key press. |key_code| is the VKEY_* value from Chromium's /// Simulate a key press. |key_code| is the VKEY_* value from Chromium's
// ui/events/keycodes/keyboard_codes.h header (VK_* values on Windows). /// ui/events/keycodes/keyboard_codes.h header (VK_* values on Windows).
// |event_flags| is some combination of EVENTFLAG_SHIFT_DOWN, /// |event_flags| is some combination of EVENTFLAG_SHIFT_DOWN,
// EVENTFLAG_CONTROL_DOWN and/or EVENTFLAG_ALT_DOWN. This function is exposed /// EVENTFLAG_CONTROL_DOWN and/or EVENTFLAG_ALT_DOWN. This function is exposed
// primarily for testing purposes. /// primarily for testing purposes.
/// ///
void(CEF_CALLBACK* send_key_press)(struct _cef_window_t* self, void(CEF_CALLBACK* send_key_press)(struct _cef_window_t* self,
int key_code, int key_code,
uint32 event_flags); uint32 event_flags);
/// ///
// Simulate a mouse move. The mouse cursor will be moved to the specified /// Simulate a mouse move. The mouse cursor will be moved to the specified
// (screen_x, screen_y) position. This function is exposed primarily for /// (screen_x, screen_y) position. This function is exposed primarily for
// testing purposes. /// testing purposes.
/// ///
void(CEF_CALLBACK* send_mouse_move)(struct _cef_window_t* self, void(CEF_CALLBACK* send_mouse_move)(struct _cef_window_t* self,
int screen_x, int screen_x,
int screen_y); int screen_y);
/// ///
// Simulate mouse down and/or mouse up events. |button| is the mouse button /// Simulate mouse down and/or mouse up events. |button| is the mouse button
// type. If |mouse_down| is true (1) a mouse down event will be sent. If /// type. If |mouse_down| is true (1) a mouse down event will be sent. If
// |mouse_up| is true (1) a mouse up event will be sent. If both are true (1) /// |mouse_up| is true (1) a mouse up event will be sent. If both are true (1)
// a mouse down event will be sent followed by a mouse up event (equivalent to /// a mouse down event will be sent followed by a mouse up event (equivalent
// clicking the mouse button). The events will be sent using the current /// to clicking the mouse button). The events will be sent using the current
// cursor position so make sure to call send_mouse_move() first to position /// cursor position so make sure to call send_mouse_move() first to position
// the mouse. This function is exposed primarily for testing purposes. /// the mouse. This function is exposed primarily for testing purposes.
/// ///
void(CEF_CALLBACK* send_mouse_events)(struct _cef_window_t* self, void(CEF_CALLBACK* send_mouse_events)(struct _cef_window_t* self,
cef_mouse_button_type_t button, cef_mouse_button_type_t button,
@ -312,10 +312,10 @@ typedef struct _cef_window_t {
int mouse_up); int mouse_up);
/// ///
// Set the keyboard accelerator for the specified |command_id|. |key_code| can /// Set the keyboard accelerator for the specified |command_id|. |key_code|
// be any virtual key or character value. cef_window_delegate_t::OnAccelerator /// can be any virtual key or character value.
// will be called if the keyboard combination is triggered while this window /// cef_window_delegate_t::OnAccelerator will be called if the keyboard
// has focus. /// combination is triggered while this window has focus.
/// ///
void(CEF_CALLBACK* set_accelerator)(struct _cef_window_t* self, void(CEF_CALLBACK* set_accelerator)(struct _cef_window_t* self,
int command_id, int command_id,
@ -325,19 +325,19 @@ typedef struct _cef_window_t {
int alt_pressed); int alt_pressed);
/// ///
// Remove the keyboard accelerator for the specified |command_id|. /// Remove the keyboard accelerator for the specified |command_id|.
/// ///
void(CEF_CALLBACK* remove_accelerator)(struct _cef_window_t* self, void(CEF_CALLBACK* remove_accelerator)(struct _cef_window_t* self,
int command_id); int command_id);
/// ///
// Remove all keyboard accelerators. /// Remove all keyboard accelerators.
/// ///
void(CEF_CALLBACK* remove_all_accelerators)(struct _cef_window_t* self); void(CEF_CALLBACK* remove_all_accelerators)(struct _cef_window_t* self);
} cef_window_t; } cef_window_t;
/// ///
// Create a new Window. /// Create a new Window.
/// ///
CEF_EXPORT cef_window_t* cef_window_create_top_level( CEF_EXPORT cef_window_t* cef_window_create_top_level(
struct _cef_window_delegate_t* delegate); struct _cef_window_delegate_t* delegate);

Some files were not shown because too many files have changed in this diff Show More