| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 m_granularity = e.scrollByPage ? | 224 m_granularity = e.scrollByPage ? |
| 225 ScrollByPageWheelEvent : ScrollByPixelWheelEvent; | 225 ScrollByPageWheelEvent : ScrollByPixelWheelEvent; |
| 226 | 226 |
| 227 m_type = PlatformEvent::Wheel; | 227 m_type = PlatformEvent::Wheel; |
| 228 | 228 |
| 229 m_timestamp = e.timeStampSeconds; | 229 m_timestamp = e.timeStampSeconds; |
| 230 m_modifiers = e.modifiers; | 230 m_modifiers = e.modifiers; |
| 231 m_dispatchType = toPlatformDispatchType(e.dispatchType); | 231 m_dispatchType = toPlatformDispatchType(e.dispatchType); |
| 232 | 232 |
| 233 m_hasPreciseScrollingDeltas = e.hasPreciseScrollingDeltas; | 233 m_hasPreciseScrollingDeltas = e.hasPreciseScrollingDeltas; |
| 234 m_canScroll = e.canScroll; | |
| 235 m_resendingPluginId = e.resendingPluginId; | 234 m_resendingPluginId = e.resendingPluginId; |
| 236 m_railsMode = static_cast<PlatformEvent::RailsMode>(e.railsMode); | 235 m_railsMode = static_cast<PlatformEvent::RailsMode>(e.railsMode); |
| 237 #if OS(MACOSX) | 236 #if OS(MACOSX) |
| 238 m_phase = static_cast<PlatformWheelEventPhase>(e.phase); | 237 m_phase = static_cast<PlatformWheelEventPhase>(e.phase); |
| 239 m_momentumPhase = static_cast<PlatformWheelEventPhase>(e.momentumPhase); | 238 m_momentumPhase = static_cast<PlatformWheelEventPhase>(e.momentumPhase); |
| 240 m_canRubberbandLeft = e.canRubberbandLeft; | 239 m_canRubberbandLeft = e.canRubberbandLeft; |
| 241 m_canRubberbandRight = e.canRubberbandRight; | 240 m_canRubberbandRight = e.canRubberbandRight; |
| 242 #endif | 241 #endif |
| 243 } | 242 } |
| 244 | 243 |
| (...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 { | 629 { |
| 631 if (event.type() != EventTypeNames::wheel && event.type() != EventTypeNames:
:mousewheel) | 630 if (event.type() != EventTypeNames::wheel && event.type() != EventTypeNames:
:mousewheel) |
| 632 return; | 631 return; |
| 633 type = WebInputEvent::MouseWheel; | 632 type = WebInputEvent::MouseWheel; |
| 634 updateWebMouseEventFromCoreMouseEvent(event, widget, layoutItem, *this); | 633 updateWebMouseEventFromCoreMouseEvent(event, widget, layoutItem, *this); |
| 635 deltaX = -event.deltaX(); | 634 deltaX = -event.deltaX(); |
| 636 deltaY = -event.deltaY(); | 635 deltaY = -event.deltaY(); |
| 637 wheelTicksX = event.ticksX(); | 636 wheelTicksX = event.ticksX(); |
| 638 wheelTicksY = event.ticksY(); | 637 wheelTicksY = event.ticksY(); |
| 639 scrollByPage = event.deltaMode() == WheelEvent::DOM_DELTA_PAGE; | 638 scrollByPage = event.deltaMode() == WheelEvent::DOM_DELTA_PAGE; |
| 640 canScroll = event.canScroll(); | |
| 641 resendingPluginId = event.resendingPluginId(); | 639 resendingPluginId = event.resendingPluginId(); |
| 642 railsMode = static_cast<RailsMode>(event.getRailsMode()); | 640 railsMode = static_cast<RailsMode>(event.getRailsMode()); |
| 643 hasPreciseScrollingDeltas = event.hasPreciseScrollingDeltas(); | 641 hasPreciseScrollingDeltas = event.hasPreciseScrollingDeltas(); |
| 644 dispatchType = event.cancelable() ? WebInputEvent::Blocking : WebInputEvent:
:EventNonBlocking; | 642 dispatchType = event.cancelable() ? WebInputEvent::Blocking : WebInputEvent:
:EventNonBlocking; |
| 645 } | 643 } |
| 646 | 644 |
| 647 WebKeyboardEventBuilder::WebKeyboardEventBuilder(const KeyboardEvent& event) | 645 WebKeyboardEventBuilder::WebKeyboardEventBuilder(const KeyboardEvent& event) |
| 648 { | 646 { |
| 649 if (event.type() == EventTypeNames::keydown) | 647 if (event.type() == EventTypeNames::keydown) |
| 650 type = KeyDown; | 648 type = KeyDown; |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 818 break; | 816 break; |
| 819 case GestureSourceTouchscreen: | 817 case GestureSourceTouchscreen: |
| 820 sourceDevice = WebGestureDeviceTouchscreen; | 818 sourceDevice = WebGestureDeviceTouchscreen; |
| 821 break; | 819 break; |
| 822 case GestureSourceUninitialized: | 820 case GestureSourceUninitialized: |
| 823 NOTREACHED(); | 821 NOTREACHED(); |
| 824 } | 822 } |
| 825 } | 823 } |
| 826 | 824 |
| 827 } // namespace blink | 825 } // namespace blink |
| OLD | NEW |