mirror of
				https://bitbucket.org/chromiumembedded/cef
				synced 2025-06-05 21:39:12 +02:00 
			
		
		
		
	Fix C compiler errors when using the C API (issue #1165).
- Replace 'bool' with 'int' in cef_types[_*].h. - Typedef enums in cef_types.h - Add includes and struct forward declarations in C API header files. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1558 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
		@@ -43,72 +43,13 @@ extern "C" {
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#include "include/capi/cef_base_capi.h"
 | 
			
		||||
#include "include/capi/cef_browser_process_handler_capi.h"
 | 
			
		||||
#include "include/capi/cef_command_line_capi.h"
 | 
			
		||||
#include "include/capi/cef_render_process_handler_capi.h"
 | 
			
		||||
#include "include/capi/cef_resource_bundle_handler_capi.h"
 | 
			
		||||
#include "include/capi/cef_scheme_capi.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// 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
 | 
			
		||||
// the browser client executable (default behavior) or from a separate
 | 
			
		||||
// executable specified by the CefSettings.browser_subprocess_path value. If
 | 
			
		||||
// 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
 | 
			
		||||
// secondary process it will block until the process should exit and then 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
 | 
			
		||||
// cef_sandbox_win.h for details).
 | 
			
		||||
///
 | 
			
		||||
CEF_EXPORT int cef_execute_process(const struct _cef_main_args_t* args,
 | 
			
		||||
    struct _cef_app_t* application, void* windows_sandbox_info);
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// This function should be called on the main application thread to initialize
 | 
			
		||||
// 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
 | 
			
		||||
// failed. The |windows_sandbox_info| parameter is only used on Windows and may
 | 
			
		||||
// be NULL (see cef_sandbox_win.h for details).
 | 
			
		||||
///
 | 
			
		||||
CEF_EXPORT int cef_initialize(const struct _cef_main_args_t* args,
 | 
			
		||||
    const struct _cef_settings_t* settings, struct _cef_app_t* application,
 | 
			
		||||
    void* windows_sandbox_info);
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// This function should be called on the main application thread to shut down
 | 
			
		||||
// the CEF browser process before the application exits.
 | 
			
		||||
///
 | 
			
		||||
CEF_EXPORT void cef_shutdown();
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// Perform a single iteration of CEF message loop processing. This function is
 | 
			
		||||
// used to integrate the CEF message loop into an existing application message
 | 
			
		||||
// loop. Care must be taken to balance performance against excessive CPU usage.
 | 
			
		||||
// This function should only be called on the main application thread and only
 | 
			
		||||
// if cef_initialize() is called with a CefSettings.multi_threaded_message_loop
 | 
			
		||||
// value of false (0). This function will not block.
 | 
			
		||||
///
 | 
			
		||||
CEF_EXPORT void cef_do_message_loop_work();
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// Run the CEF message loop. Use this function instead of an application-
 | 
			
		||||
// 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
 | 
			
		||||
// only if cef_initialize() is called with a
 | 
			
		||||
// CefSettings.multi_threaded_message_loop value of false (0). This function
 | 
			
		||||
// will block until a quit message is received by the system.
 | 
			
		||||
///
 | 
			
		||||
CEF_EXPORT void cef_run_message_loop();
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// Quit the CEF message loop that was started by calling cef_run_message_loop().
 | 
			
		||||
// This function should only be called on the main application thread and only
 | 
			
		||||
// if cef_run_message_loop() was used.
 | 
			
		||||
///
 | 
			
		||||
CEF_EXPORT void cef_quit_message_loop();
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// 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.
 | 
			
		||||
///
 | 
			
		||||
CEF_EXPORT void cef_set_osmodal_loop(int osModalLoop);
 | 
			
		||||
struct _cef_app_t;
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// Implement this structure to provide handler implementations. Methods will be
 | 
			
		||||
@@ -169,6 +110,71 @@ typedef struct _cef_app_t {
 | 
			
		||||
} cef_app_t;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// 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
 | 
			
		||||
// the browser client executable (default behavior) or from a separate
 | 
			
		||||
// executable specified by the CefSettings.browser_subprocess_path value. If
 | 
			
		||||
// 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
 | 
			
		||||
// secondary process it will block until the process should exit and then 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
 | 
			
		||||
// cef_sandbox_win.h for details).
 | 
			
		||||
///
 | 
			
		||||
CEF_EXPORT int cef_execute_process(const struct _cef_main_args_t* args,
 | 
			
		||||
    cef_app_t* application, void* windows_sandbox_info);
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// This function should be called on the main application thread to initialize
 | 
			
		||||
// 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
 | 
			
		||||
// failed. The |windows_sandbox_info| parameter is only used on Windows and may
 | 
			
		||||
// be NULL (see cef_sandbox_win.h for details).
 | 
			
		||||
///
 | 
			
		||||
CEF_EXPORT int cef_initialize(const struct _cef_main_args_t* args,
 | 
			
		||||
    const struct _cef_settings_t* settings, cef_app_t* application,
 | 
			
		||||
    void* windows_sandbox_info);
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// This function should be called on the main application thread to shut down
 | 
			
		||||
// the CEF browser process before the application exits.
 | 
			
		||||
///
 | 
			
		||||
CEF_EXPORT void cef_shutdown();
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// Perform a single iteration of CEF message loop processing. This function is
 | 
			
		||||
// used to integrate the CEF message loop into an existing application message
 | 
			
		||||
// loop. Care must be taken to balance performance against excessive CPU usage.
 | 
			
		||||
// This function should only be called on the main application thread and only
 | 
			
		||||
// if cef_initialize() is called with a CefSettings.multi_threaded_message_loop
 | 
			
		||||
// value of false (0). This function will not block.
 | 
			
		||||
///
 | 
			
		||||
CEF_EXPORT void cef_do_message_loop_work();
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// Run the CEF message loop. Use this function instead of an application-
 | 
			
		||||
// 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
 | 
			
		||||
// only if cef_initialize() is called with a
 | 
			
		||||
// CefSettings.multi_threaded_message_loop value of false (0). This function
 | 
			
		||||
// will block until a quit message is received by the system.
 | 
			
		||||
///
 | 
			
		||||
CEF_EXPORT void cef_run_message_loop();
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// Quit the CEF message loop that was started by calling cef_run_message_loop().
 | 
			
		||||
// This function should only be called on the main application thread and only
 | 
			
		||||
// if cef_run_message_loop() was used.
 | 
			
		||||
///
 | 
			
		||||
CEF_EXPORT void cef_quit_message_loop();
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// 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.
 | 
			
		||||
///
 | 
			
		||||
CEF_EXPORT void cef_set_osmodal_loop(int osModalLoop);
 | 
			
		||||
 | 
			
		||||
#ifdef __cplusplus
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user