summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/render_widget_host_view_aura.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index c311abf..12bcda1 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -68,10 +68,13 @@ void UpdateWebTouchEventAfterDispatch(WebKit::WebTouchEvent* event,
}
}
-bool CanRendererHandleEvent(const base::NativeEvent& native_event) {
+bool CanRendererHandleEvent(const aura::MouseEvent* event) {
+ if (event->type() == ui::ET_MOUSE_CAPTURE_CHANGED)
+ return false;
+
#if defined(OS_WIN)
// Renderer cannot handle WM_XBUTTON events.
- switch (native_event.message) {
+ switch (event->native_event().message) {
case WM_XBUTTONDOWN:
case WM_XBUTTONUP:
case WM_XBUTTONDBLCLK:
@@ -838,7 +841,7 @@ bool RenderWidgetHostViewAura::OnMouseEvent(aura::MouseEvent* event) {
}
// Forward event to renderer.
- if (CanRendererHandleEvent(event->native_event()))
+ if (CanRendererHandleEvent(event))
host_->ForwardMouseEvent(mouse_event);
}
@@ -855,7 +858,7 @@ bool RenderWidgetHostViewAura::OnMouseEvent(aura::MouseEvent* event) {
content::MakeWebMouseWheelEvent(static_cast<aura::ScrollEvent*>(event));
if (mouse_wheel_event.deltaX != 0 || mouse_wheel_event.deltaY != 0)
host_->ForwardWheelEvent(mouse_wheel_event);
- } else if (CanRendererHandleEvent(event->native_event())) {
+ } else if (CanRendererHandleEvent(event)) {
WebKit::WebMouseEvent mouse_event = content::MakeWebMouseEvent(event);
ModifyEventMovementAndCoords(&mouse_event);
host_->ForwardMouseEvent(mouse_event);