mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Merge revision 569 and 624 changes:
- Add off-screen rendering support for Mac OS-X (issue #540). - Add patch for ninja build support on Mac OS-X. - Avoid calling OnSetFocus multiple times (issue #563). git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1025@626 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -606,21 +606,28 @@ int CEF_CALLBACK browser_get_image(struct _cef_browser_t* self,
|
||||
}
|
||||
|
||||
void CEF_CALLBACK browser_send_key_event(struct _cef_browser_t* self,
|
||||
enum cef_key_type_t type, int key, int modifiers, int sysChar,
|
||||
int imeChar) {
|
||||
enum cef_key_type_t type, const struct _cef_key_info_t* keyInfo,
|
||||
int modifiers) {
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
if (!self)
|
||||
return;
|
||||
// Verify param: keyInfo; type: struct_byref_const
|
||||
DCHECK(keyInfo);
|
||||
if (!keyInfo)
|
||||
return;
|
||||
|
||||
// Translate param: keyInfo; type: struct_byref_const
|
||||
CefKeyInfo keyInfoObj;
|
||||
if (keyInfo)
|
||||
keyInfoObj.Set(*keyInfo, false);
|
||||
|
||||
// Execute
|
||||
CefBrowserCppToC::Get(self)->SendKeyEvent(
|
||||
type,
|
||||
key,
|
||||
modifiers,
|
||||
sysChar?true:false,
|
||||
imeChar?true:false);
|
||||
keyInfoObj,
|
||||
modifiers);
|
||||
}
|
||||
|
||||
void CEF_CALLBACK browser_send_mouse_click_event(struct _cef_browser_t* self,
|
||||
@ -657,7 +664,7 @@ void CEF_CALLBACK browser_send_mouse_move_event(struct _cef_browser_t* self,
|
||||
}
|
||||
|
||||
void CEF_CALLBACK browser_send_mouse_wheel_event(struct _cef_browser_t* self,
|
||||
int x, int y, int delta) {
|
||||
int x, int y, int deltaX, int deltaY) {
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
@ -668,7 +675,8 @@ void CEF_CALLBACK browser_send_mouse_wheel_event(struct _cef_browser_t* self,
|
||||
CefBrowserCppToC::Get(self)->SendMouseWheelEvent(
|
||||
x,
|
||||
y,
|
||||
delta);
|
||||
deltaX,
|
||||
deltaY);
|
||||
}
|
||||
|
||||
void CEF_CALLBACK browser_send_focus_event(struct _cef_browser_t* self,
|
||||
|
Reference in New Issue
Block a user