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

Fix C compiler errors when using the C API (issue #1165).

Browse Source 
- 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:
Marshall Greenblatt
2014-01-06 19:59:48 +00:00
parent 7074154725
commit 72660c6fed
72 changed files with 612 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libcef_dll/cpptoc/browser_cpptoc.cc
View File

@ -334,8 +334,7 @@ void CEF_CALLBACK browser_get_frame_names(struct _cef_browser_t* self,
}
int CEF_CALLBACK browser_send_process_message(struct _cef_browser_t* self,
enum cef_process_id_t target_process,
struct _cef_process_message_t* message) {
cef_process_id_t target_process, struct _cef_process_message_t* message) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);

6
libcef_dll/cpptoc/browser_host_cpptoc.cc
View File

@ -242,7 +242,7 @@ void CEF_CALLBACK browser_host_set_zoom_level(struct _cef_browser_host_t* self,
}
void CEF_CALLBACK browser_host_run_file_dialog(struct _cef_browser_host_t* self,
enum cef_file_dialog_mode_t mode, const cef_string_t* title,
cef_file_dialog_mode_t mode, const cef_string_t* title,
const cef_string_t* default_file_name, cef_string_list_t accept_types,
cef_run_file_dialog_callback_t* callback) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -461,7 +461,7 @@ void CEF_CALLBACK browser_host_notify_screen_info_changed(
}
void CEF_CALLBACK browser_host_invalidate(struct _cef_browser_host_t* self,
const cef_rect_t* dirtyRect, enum cef_paint_element_type_t type) {
const cef_rect_t* dirtyRect, cef_paint_element_type_t type) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
@ -505,7 +505,7 @@ void CEF_CALLBACK browser_host_send_key_event(struct _cef_browser_host_t* self,
void CEF_CALLBACK browser_host_send_mouse_click_event(
struct _cef_browser_host_t* self, const struct _cef_mouse_event_t* event,
enum cef_mouse_button_type_t type, int mouseUp, int clickCount) {
cef_mouse_button_type_t type, int mouseUp, int clickCount) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);

2
libcef_dll/cpptoc/client_cpptoc.cc
View File

@ -239,7 +239,7 @@ struct _cef_request_handler_t* CEF_CALLBACK client_get_request_handler(
}
int CEF_CALLBACK client_on_process_message_received(struct _cef_client_t* self,
cef_browser_t* browser, enum cef_process_id_t source_process,
cef_browser_t* browser, cef_process_id_t source_process,
struct _cef_process_message_t* message) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

2
libcef_dll/cpptoc/context_menu_handler_cpptoc.cc
View File

@ -56,7 +56,7 @@ void CEF_CALLBACK context_menu_handler_on_before_context_menu(
int CEF_CALLBACK context_menu_handler_on_context_menu_command(
struct _cef_context_menu_handler_t* self, cef_browser_t* browser,
struct _cef_frame_t* frame, struct _cef_context_menu_params_t* params,
int command_id, enum cef_event_flags_t event_flags) {
int command_id, cef_event_flags_t event_flags) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);

8
libcef_dll/cpptoc/context_menu_params_cpptoc.cc
View File

@ -45,7 +45,7 @@ int CEF_CALLBACK context_menu_params_get_ycoord(
return _retval;
}
enum cef_context_menu_type_flags_t CEF_CALLBACK context_menu_params_get_type_flags(
cef_context_menu_type_flags_t CEF_CALLBACK context_menu_params_get_type_flags(
struct _cef_context_menu_params_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -167,7 +167,7 @@ cef_string_userfree_t CEF_CALLBACK context_menu_params_get_frame_charset(
return _retval.DetachToUserFree();
}
enum cef_context_menu_media_type_t CEF_CALLBACK context_menu_params_get_media_type(
cef_context_menu_media_type_t CEF_CALLBACK context_menu_params_get_media_type(
struct _cef_context_menu_params_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -183,7 +183,7 @@ enum cef_context_menu_media_type_t CEF_CALLBACK context_menu_params_get_media_ty
return _retval;
}
enum cef_context_menu_media_state_flags_t CEF_CALLBACK context_menu_params_get_media_state_flags(
cef_context_menu_media_state_flags_t CEF_CALLBACK context_menu_params_get_media_state_flags(
struct _cef_context_menu_params_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -244,7 +244,7 @@ int CEF_CALLBACK context_menu_params_is_speech_input_enabled(
return _retval;
}
enum cef_context_menu_edit_state_flags_t CEF_CALLBACK context_menu_params_get_edit_state_flags(
cef_context_menu_edit_state_flags_t CEF_CALLBACK context_menu_params_get_edit_state_flags(
struct _cef_context_menu_params_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

2
libcef_dll/cpptoc/dialog_handler_cpptoc.cc
View File

@ -20,7 +20,7 @@
int CEF_CALLBACK dialog_handler_on_file_dialog(
struct _cef_dialog_handler_t* self, cef_browser_t* browser,
enum cef_file_dialog_mode_t mode, const cef_string_t* title,
cef_file_dialog_mode_t mode, const cef_string_t* title,
const cef_string_t* default_file_name, cef_string_list_t accept_types,
cef_file_dialog_callback_t* callback) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

2
libcef_dll/cpptoc/dictionary_value_cpptoc.cc
View File

@ -190,7 +190,7 @@ int CEF_CALLBACK dictionary_value_remove(struct _cef_dictionary_value_t* self,
return _retval;
}
enum cef_value_type_t CEF_CALLBACK dictionary_value_get_type(
cef_value_type_t CEF_CALLBACK dictionary_value_get_type(
struct _cef_dictionary_value_t* self, const cef_string_t* key) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

2
libcef_dll/cpptoc/domdocument_cpptoc.cc
View File

@ -16,7 +16,7 @@
// MEMBER FUNCTIONS - Body may be edited by hand.
enum cef_dom_document_type_t CEF_CALLBACK domdocument_get_type(
cef_dom_document_type_t CEF_CALLBACK domdocument_get_type(
struct _cef_domdocument_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

4
libcef_dll/cpptoc/domevent_cpptoc.cc
View File

@ -32,7 +32,7 @@ cef_string_userfree_t CEF_CALLBACK domevent_get_type(
return _retval.DetachToUserFree();
}
enum cef_dom_event_category_t CEF_CALLBACK domevent_get_category(
cef_dom_event_category_t CEF_CALLBACK domevent_get_category(
struct _cef_domevent_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -48,7 +48,7 @@ enum cef_dom_event_category_t CEF_CALLBACK domevent_get_category(
return _retval;
}
enum cef_dom_event_phase_t CEF_CALLBACK domevent_get_phase(
cef_dom_event_phase_t CEF_CALLBACK domevent_get_phase(
struct _cef_domevent_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

3
libcef_dll/cpptoc/domnode_cpptoc.cc
View File

@ -18,8 +18,7 @@
// MEMBER FUNCTIONS - Body may be edited by hand.
enum cef_dom_node_type_t CEF_CALLBACK domnode_get_type(
struct _cef_domnode_t* self) {
cef_dom_node_type_t CEF_CALLBACK domnode_get_type(struct _cef_domnode_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);

2
libcef_dll/cpptoc/drag_handler_cpptoc.cc
View File

@ -19,7 +19,7 @@
int CEF_CALLBACK drag_handler_on_drag_enter(struct _cef_drag_handler_t* self,
cef_browser_t* browser, cef_drag_data_t* dragData,
enum cef_drag_operations_mask_t mask) {
cef_drag_operations_mask_t mask) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);

2
libcef_dll/cpptoc/focus_handler_cpptoc.cc
View File

@ -35,7 +35,7 @@ void CEF_CALLBACK focus_handler_on_take_focus(struct _cef_focus_handler_t* self,
}
int CEF_CALLBACK focus_handler_on_set_focus(struct _cef_focus_handler_t* self,
cef_browser_t* browser, enum cef_focus_source_t source) {
cef_browser_t* browser, cef_focus_source_t source) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);

2
libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc
View File

@ -20,7 +20,7 @@
int CEF_CALLBACK jsdialog_handler_on_jsdialog(
struct _cef_jsdialog_handler_t* self, cef_browser_t* browser,
const cef_string_t* origin_url, const cef_string_t* accept_lang,
enum cef_jsdialog_type_t dialog_type, const cef_string_t* message_text,
cef_jsdialog_type_t dialog_type, const cef_string_t* message_text,
const cef_string_t* default_prompt_text, cef_jsdialog_callback_t* callback,
int* suppress_message) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

2
libcef_dll/cpptoc/list_value_cpptoc.cc
View File

@ -150,7 +150,7 @@ int CEF_CALLBACK list_value_remove(struct _cef_list_value_t* self, int index) {
return _retval;
}
enum cef_value_type_t CEF_CALLBACK list_value_get_type(
cef_value_type_t CEF_CALLBACK list_value_get_type(
struct _cef_list_value_t* self, int index) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

2
libcef_dll/cpptoc/load_handler_cpptoc.cc
View File

@ -84,7 +84,7 @@ void CEF_CALLBACK load_handler_on_load_end(struct _cef_load_handler_t* self,
}
void CEF_CALLBACK load_handler_on_load_error(struct _cef_load_handler_t* self,
cef_browser_t* browser, cef_frame_t* frame, enum cef_errorcode_t errorCode,
cef_browser_t* browser, cef_frame_t* frame, cef_errorcode_t errorCode,
const cef_string_t* errorText, const cef_string_t* failedUrl) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

4
libcef_dll/cpptoc/menu_model_cpptoc.cc
View File

@ -405,7 +405,7 @@ int CEF_CALLBACK menu_model_set_label_at(struct _cef_menu_model_t* self,
return _retval;
}
enum cef_menu_item_type_t CEF_CALLBACK menu_model_get_type(
cef_menu_item_type_t CEF_CALLBACK menu_model_get_type(
struct _cef_menu_model_t* self, int command_id) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -421,7 +421,7 @@ enum cef_menu_item_type_t CEF_CALLBACK menu_model_get_type(
return _retval;
}
enum cef_menu_item_type_t CEF_CALLBACK menu_model_get_type_at(
cef_menu_item_type_t CEF_CALLBACK menu_model_get_type_at(
struct _cef_menu_model_t* self, int index) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

2
libcef_dll/cpptoc/post_data_element_cpptoc.cc
View File

@ -90,7 +90,7 @@ void CEF_CALLBACK post_data_element_set_to_bytes(
bytes);
}
enum cef_postdataelement_type_t CEF_CALLBACK post_data_element_get_type(
cef_postdataelement_type_t CEF_CALLBACK post_data_element_get_type(
struct _cef_post_data_element_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

2
libcef_dll/cpptoc/render_handler_cpptoc.cc
View File

@ -207,7 +207,7 @@ void CEF_CALLBACK render_handler_on_popup_size(
}
void CEF_CALLBACK render_handler_on_paint(struct _cef_render_handler_t* self,
cef_browser_t* browser, enum cef_paint_element_type_t type,
cef_browser_t* browser, cef_paint_element_type_t type,
size_t dirtyRectsCount, cef_rect_t const* dirtyRects, const void* buffer,
int width, int height) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

4
libcef_dll/cpptoc/render_process_handler_cpptoc.cc
View File

@ -108,7 +108,7 @@ cef_load_handler_t* CEF_CALLBACK render_process_handler_get_load_handler(
int CEF_CALLBACK render_process_handler_on_before_navigation(
struct _cef_render_process_handler_t* self, cef_browser_t* browser,
cef_frame_t* frame, struct _cef_request_t* request,
enum cef_navigation_type_t navigation_type, int is_redirect) {
cef_navigation_type_t navigation_type, int is_redirect) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
@ -258,7 +258,7 @@ void CEF_CALLBACK render_process_handler_on_focused_node_changed(
int CEF_CALLBACK render_process_handler_on_process_message_received(
struct _cef_render_process_handler_t* self, cef_browser_t* browser,
enum cef_process_id_t source_process, cef_process_message_t* message) {
cef_process_id_t source_process, cef_process_message_t* message) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);

4
libcef_dll/cpptoc/request_cpptoc.cc
View File

@ -278,7 +278,7 @@ void CEF_CALLBACK request_set_first_party_for_cookies(
CefString(url));
}
enum cef_resource_type_t CEF_CALLBACK request_get_resource_type(
cef_resource_type_t CEF_CALLBACK request_get_resource_type(
struct _cef_request_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -293,7 +293,7 @@ enum cef_resource_type_t CEF_CALLBACK request_get_resource_type(
return _retval;
}
enum cef_transition_type_t CEF_CALLBACK request_get_transition_type(
cef_transition_type_t CEF_CALLBACK request_get_transition_type(
struct _cef_request_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

4
libcef_dll/cpptoc/request_handler_cpptoc.cc
View File

@ -271,7 +271,7 @@ void CEF_CALLBACK request_handler_on_protocol_execution(
}
int CEF_CALLBACK request_handler_on_certificate_error(
struct _cef_request_handler_t* self, enum cef_errorcode_t cert_error,
struct _cef_request_handler_t* self, cef_errorcode_t cert_error,
const cef_string_t* request_url,
cef_allow_certificate_error_callback_t* callback) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -353,7 +353,7 @@ void CEF_CALLBACK request_handler_on_plugin_crashed(
void CEF_CALLBACK request_handler_on_render_process_terminated(
struct _cef_request_handler_t* self, cef_browser_t* browser,
enum cef_termination_status_t status) {
cef_termination_status_t status) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);

4
libcef_dll/cpptoc/urlrequest_cpptoc.cc
View File

@ -74,7 +74,7 @@ struct _cef_urlrequest_client_t* CEF_CALLBACK urlrequest_get_client(
return CefURLRequestClientCToCpp::Unwrap(_retval);
}
enum cef_urlrequest_status_t CEF_CALLBACK urlrequest_get_request_status(
cef_urlrequest_status_t CEF_CALLBACK urlrequest_get_request_status(
struct _cef_urlrequest_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -90,7 +90,7 @@ enum cef_urlrequest_status_t CEF_CALLBACK urlrequest_get_request_status(
return _retval;
}
enum cef_errorcode_t CEF_CALLBACK urlrequest_get_request_error(
cef_errorcode_t CEF_CALLBACK urlrequest_get_request_error(
struct _cef_urlrequest_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

6
libcef_dll/cpptoc/v8value_cpptoc.cc
View File

@ -641,7 +641,7 @@ struct _cef_v8value_t* CEF_CALLBACK v8value_get_value_byindex(
int CEF_CALLBACK v8value_set_value_bykey(struct _cef_v8value_t* self,
const cef_string_t* key, struct _cef_v8value_t* value,
enum cef_v8_propertyattribute_t attribute) {
cef_v8_propertyattribute_t attribute) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
@ -689,8 +689,8 @@ int CEF_CALLBACK v8value_set_value_byindex(struct _cef_v8value_t* self,
}
int CEF_CALLBACK v8value_set_value_byaccessor(struct _cef_v8value_t* self,
const cef_string_t* key, enum cef_v8_accesscontrol_t settings,
enum cef_v8_propertyattribute_t attribute) {
const cef_string_t* key, cef_v8_accesscontrol_t settings,
cef_v8_propertyattribute_t attribute) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);

4
libcef_dll/cpptoc/xml_reader_cpptoc.cc
View File

@ -17,7 +17,7 @@
// GLOBAL FUNCTIONS - Body may be edited by hand.
CEF_EXPORT cef_xml_reader_t* cef_xml_reader_create(cef_stream_reader_t* stream,
enum cef_xml_encoding_type_t encodingType, const cef_string_t* URI) {
cef_xml_encoding_type_t encodingType, const cef_string_t* URI) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: stream; type: refptr_same
@ -99,7 +99,7 @@ cef_string_userfree_t CEF_CALLBACK xml_reader_get_error(
return _retval.DetachToUserFree();
}
enum cef_xml_node_type_t CEF_CALLBACK xml_reader_get_type(
cef_xml_node_type_t CEF_CALLBACK xml_reader_get_type(
struct _cef_xml_reader_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING