Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(654)

Unified Diff: Source/core/dom/WheelEvent.cpp

Issue 22859012: Add support for DOM Level 3 WheelEvent (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Simplify test case Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/dom/WheelEvent.cpp
diff --git a/Source/core/dom/WheelEvent.cpp b/Source/core/dom/WheelEvent.cpp
index c7bdf0d638023da48258ed4e3d9b1671e84ecf11..d19740de9e1c77709774470862b8e185f388af84 100644
--- a/Source/core/dom/WheelEvent.cpp
+++ b/Source/core/dom/WheelEvent.cpp
@@ -30,8 +30,8 @@
namespace WebCore {
WheelEventInit::WheelEventInit()
- : wheelDeltaX(0)
- , wheelDeltaY(0)
+ : deltaX(0)
+ , deltaY(0)
, deltaMode(WheelEvent::DOM_DELTA_PIXEL)
{
}
@@ -45,7 +45,7 @@ WheelEvent::WheelEvent()
WheelEvent::WheelEvent(const AtomicString& type, const WheelEventInit& initializer)
: MouseEvent(type, initializer)
- , m_wheelDelta(IntPoint(initializer.wheelDeltaX, initializer.wheelDeltaY))
+ , m_wheelDelta(IntPoint(initializer.deltaX, initializer.deltaY))
, m_deltaMode(initializer.deltaMode)
{
ScriptWrappable::init(this);
@@ -54,7 +54,7 @@ WheelEvent::WheelEvent(const AtomicString& type, const WheelEventInit& initializ
WheelEvent::WheelEvent(const FloatPoint& wheelTicks, const FloatPoint& rawDelta, unsigned deltaMode,
PassRefPtr<AbstractView> view, const IntPoint& screenLocation, const IntPoint& pageLocation,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool directionInvertedFromDevice)
- : MouseEvent(eventNames().mousewheelEvent,
+ : MouseEvent(eventNames().wheelEvent,
true, true, view, 0, screenLocation.x(), screenLocation.y(),
pageLocation.x(), pageLocation.y(),
0, 0,
@@ -74,7 +74,7 @@ void WheelEvent::initWheelEvent(int rawDeltaX, int rawDeltaY, PassRefPtr<Abstrac
if (dispatched())
return;
- initUIEvent(eventNames().mousewheelEvent, true, true, view, 0);
+ initUIEvent(eventNames().wheelEvent, true, true, view, 0);
m_screenLocation = IntPoint(screenX, screenY);
m_ctrlKey = ctrlKey;

Powered by Google App Engine
This is Rietveld 408576698