mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
- Add off-screen rendering support for Mac OS-X (issue #540).
- Add patch for ninja build support on Mac OS-X. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@624 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -440,13 +440,13 @@ bool CefBrowserImpl::GetImage(PaintElementType type, int width, int height,
|
||||
return false;
|
||||
}
|
||||
|
||||
void CefBrowserImpl::SendKeyEvent(KeyType type, int key, int modifiers,
|
||||
bool sysChar, bool imeChar) {
|
||||
void CefBrowserImpl::SendKeyEvent(KeyType type, const CefKeyInfo& keyInfo,
|
||||
int modifiers) {
|
||||
// Intentially post event tasks in all cases so that painting tasks can be
|
||||
// handled at sane times.
|
||||
CefThread::PostTask(CefThread::UI, FROM_HERE,
|
||||
base::Bind(&CefBrowserImpl::UIT_SendKeyEvent, this, type, key, modifiers,
|
||||
sysChar, imeChar));
|
||||
base::Bind(&CefBrowserImpl::UIT_SendKeyEvent, this, type, keyInfo,
|
||||
modifiers));
|
||||
}
|
||||
|
||||
void CefBrowserImpl::SendMouseClickEvent(int x, int y, MouseButtonType type,
|
||||
@ -466,11 +466,12 @@ void CefBrowserImpl::SendMouseMoveEvent(int x, int y, bool mouseLeave) {
|
||||
mouseLeave));
|
||||
}
|
||||
|
||||
void CefBrowserImpl::SendMouseWheelEvent(int x, int y, int delta) {
|
||||
void CefBrowserImpl::SendMouseWheelEvent(int x, int y, int deltaX, int deltaY) {
|
||||
// Intentially post event tasks in all cases so that painting tasks can be
|
||||
// handled at sane times.
|
||||
CefThread::PostTask(CefThread::UI, FROM_HERE,
|
||||
base::Bind(&CefBrowserImpl::UIT_SendMouseWheelEvent, this, x, y, delta));
|
||||
base::Bind(&CefBrowserImpl::UIT_SendMouseWheelEvent, this, x, y, deltaX,
|
||||
deltaY));
|
||||
}
|
||||
|
||||
void CefBrowserImpl::SendFocusEvent(bool setFocus) {
|
||||
@ -1051,16 +1052,16 @@ void CefBrowserImpl::UIT_Invalidate(const CefRect& dirtyRect) {
|
||||
}
|
||||
}
|
||||
|
||||
void CefBrowserImpl::UIT_SendKeyEvent(KeyType type, int key, int modifiers,
|
||||
bool sysChar, bool imeChar) {
|
||||
void CefBrowserImpl::UIT_SendKeyEvent(KeyType type, const CefKeyInfo& keyInfo,
|
||||
int modifiers) {
|
||||
REQUIRE_UIT();
|
||||
if (popuphost_) {
|
||||
// Send the event to the popup.
|
||||
popuphost_->SendKeyEvent(type, key, modifiers, sysChar, imeChar);
|
||||
popuphost_->SendKeyEvent(type, keyInfo, modifiers);
|
||||
} else {
|
||||
WebViewHost* host = UIT_GetWebViewHost();
|
||||
if (host)
|
||||
host->SendKeyEvent(type, key, modifiers, sysChar, imeChar);
|
||||
host->SendKeyEvent(type, keyInfo, modifiers);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1091,16 +1092,17 @@ void CefBrowserImpl::UIT_SendMouseMoveEvent(int x, int y, bool mouseLeave) {
|
||||
}
|
||||
}
|
||||
|
||||
void CefBrowserImpl::UIT_SendMouseWheelEvent(int x, int y, int delta) {
|
||||
void CefBrowserImpl::UIT_SendMouseWheelEvent(int x, int y, int deltaX,
|
||||
int deltaY) {
|
||||
REQUIRE_UIT();
|
||||
if (popuphost_ && popup_rect_.Contains(x, y)) {
|
||||
// Send the event to the popup.
|
||||
popuphost_->SendMouseWheelEvent(x - popup_rect_.x(), y - popup_rect_.y(),
|
||||
delta);
|
||||
deltaX, deltaY);
|
||||
} else {
|
||||
WebViewHost* host = UIT_GetWebViewHost();
|
||||
if (host)
|
||||
host->SendMouseWheelEvent(x, y, delta);
|
||||
host->SendMouseWheelEvent(x, y, deltaX, deltaY);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user