diff options
author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/dom/WheelEvent.h | |
parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/dom/WheelEvent.h')
-rw-r--r-- | WebCore/dom/WheelEvent.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/dom/WheelEvent.h b/WebCore/dom/WheelEvent.h index 015796e..04d5421 100644 --- a/WebCore/dom/WheelEvent.h +++ b/WebCore/dom/WheelEvent.h @@ -35,11 +35,11 @@ namespace WebCore { { return adoptRef(new WheelEvent); } - static PassRefPtr<WheelEvent> create(float wheelDeltaX, float wheelDeltaY, PassRefPtr<AbstractView> view, + static PassRefPtr<WheelEvent> create(float wheelTicksX, float wheelTicksY, PassRefPtr<AbstractView> view, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey) { - return adoptRef(new WheelEvent(wheelDeltaX, wheelDeltaY, view, screenX, screenY, pageX, pageY, + return adoptRef(new WheelEvent(wheelTicksX, wheelTicksY, view, screenX, screenY, pageX, pageY, ctrlKey, altKey, shiftKey, metaKey)); } @@ -56,7 +56,7 @@ namespace WebCore { private: WheelEvent(); - WheelEvent(float wheelDeltaX, float wheelDeltaY, PassRefPtr<AbstractView>, + WheelEvent(float wheelTicksX, float wheelTicksY, PassRefPtr<AbstractView>, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey); |