| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "content/browser/renderer_host/web_input_event_aura.h" | 5 #include "content/browser/renderer_host/web_input_event_aura.h" | 
| 6 | 6 | 
| 7 #include "content/browser/renderer_host/ui_events_helper.h" | 7 #include "content/browser/renderer_host/ui_events_helper.h" | 
| 8 #include "ui/aura/window.h" | 8 #include "ui/aura/window.h" | 
| 9 #include "ui/events/event.h" | 9 #include "ui/events/event.h" | 
| 10 #include "ui/events/event_utils.h" | 10 #include "ui/events/event_utils.h" | 
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 353   return gesture_event; | 353   return gesture_event; | 
| 354 } | 354 } | 
| 355 | 355 | 
| 356 blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(ui::MouseEvent* event) { | 356 blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(ui::MouseEvent* event) { | 
| 357   blink::WebMouseEvent webkit_event; | 357   blink::WebMouseEvent webkit_event; | 
| 358 | 358 | 
| 359   webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); | 359   webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); | 
| 360   webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); | 360   webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); | 
| 361 | 361 | 
| 362   webkit_event.button = blink::WebMouseEvent::ButtonNone; | 362   webkit_event.button = blink::WebMouseEvent::ButtonNone; | 
| 363   int button_flags = event->flags(); | 363   if (event->flags() & ui::EF_LEFT_MOUSE_BUTTON) | 
| 364   if (event->type() == ui::ET_MOUSE_PRESSED || |  | 
| 365       event->type() == ui::ET_MOUSE_RELEASED) { |  | 
| 366     button_flags = event->changed_button_flags(); |  | 
| 367   } |  | 
| 368   if (button_flags & ui::EF_LEFT_MOUSE_BUTTON) |  | 
| 369     webkit_event.button = blink::WebMouseEvent::ButtonLeft; | 364     webkit_event.button = blink::WebMouseEvent::ButtonLeft; | 
| 370   if (button_flags & ui::EF_MIDDLE_MOUSE_BUTTON) | 365   if (event->flags() & ui::EF_MIDDLE_MOUSE_BUTTON) | 
| 371     webkit_event.button = blink::WebMouseEvent::ButtonMiddle; | 366     webkit_event.button = blink::WebMouseEvent::ButtonMiddle; | 
| 372   if (button_flags & ui::EF_RIGHT_MOUSE_BUTTON) | 367   if (event->flags() & ui::EF_RIGHT_MOUSE_BUTTON) | 
| 373     webkit_event.button = blink::WebMouseEvent::ButtonRight; | 368     webkit_event.button = blink::WebMouseEvent::ButtonRight; | 
| 374 | 369 | 
| 375   switch (event->type()) { | 370   switch (event->type()) { | 
| 376     case ui::ET_MOUSE_PRESSED: | 371     case ui::ET_MOUSE_PRESSED: | 
| 377       webkit_event.type = blink::WebInputEvent::MouseDown; | 372       webkit_event.type = blink::WebInputEvent::MouseDown; | 
| 378       webkit_event.clickCount = event->GetClickCount(); | 373       webkit_event.clickCount = event->GetClickCount(); | 
| 379       break; | 374       break; | 
| 380     case ui::ET_MOUSE_RELEASED: | 375     case ui::ET_MOUSE_RELEASED: | 
| 381       webkit_event.type = blink::WebInputEvent::MouseUp; | 376       webkit_event.type = blink::WebInputEvent::MouseUp; | 
| 382       webkit_event.clickCount = event->GetClickCount(); | 377       webkit_event.clickCount = event->GetClickCount(); | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
| 412     webkit_event.deltaY = event->y_offset(); | 407     webkit_event.deltaY = event->y_offset(); | 
| 413   } | 408   } | 
| 414 | 409 | 
| 415   webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; | 410   webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; | 
| 416   webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; | 411   webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; | 
| 417 | 412 | 
| 418   return webkit_event; | 413   return webkit_event; | 
| 419 } | 414 } | 
| 420 | 415 | 
| 421 }  // namespace content | 416 }  // namespace content | 
| OLD | NEW | 
|---|