Changeset 171531 in webkit

Timestamp:

Jul 24, 2014 3:17:58 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Let WheelEvent wrap a PlatformWheelEvent
​https://bugs.webkit.org/show_bug.cgi?id=135244

When WheelEvent is initialized with a PlatformWheelEvent, store that PlatformWheelEvent for future use.

Patch by Wenson Hsieh <Wenson Hsieh> on 2014-07-24
Reviewed by Beth Dakin.

No new tests because behavior should not have changed.

• dom/WheelEvent.cpp: Added method to access the PlatformWheelEvent.

(WebCore::WheelEvent::WheelEvent):

• dom/WheelEvent.h: Added field to store PlatformWheelEvent, if initialized via PlatformWheelEvent.

(WebCore::WheelEvent::wheelEvent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/WheelEvent.cpp (modified) (1 diff)
• dom/WheelEvent.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-24  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Let WheelEvent wrap a PlatformWheelEvent
+        https://bugs.webkit.org/show_bug.cgi?id=135244
+
+        When WheelEvent is initialized with a PlatformWheelEvent, store that PlatformWheelEvent for future use.
+
+        Reviewed by Beth Dakin.
+
+        No new tests because behavior should not have changed.
+
+        * dom/WheelEvent.cpp: Added method to access the PlatformWheelEvent.
+        (WebCore::WheelEvent::WheelEvent):
+        * dom/WheelEvent.h: Added field to store PlatformWheelEvent, if initialized via PlatformWheelEvent.
+        (WebCore::WheelEvent::wheelEvent):
+
 2014-07-24  Brian J. Burg  <burg@cs.washington.edu>
 

trunk/Source/WebCore/dom/WheelEvent.cpp

@@ -77 +77 @@
     , m_deltaMode(determineDeltaMode(event))
     , m_directionInvertedFromDevice(event.directionInvertedFromDevice())
+    , m_wheelEvent(std::make_unique<PlatformWheelEvent>(event))
 #if PLATFORM(MAC)
     , m_phase(event.phase())

trunk/Source/WebCore/dom/WheelEvent.h

@@ -78 +78 @@
         bool ctrlKey, bool altKey, bool shiftKey, bool metaKey);
 
+    const PlatformWheelEvent* wheelEvent() const { return m_wheelEvent.get(); }
     double deltaX() const { return m_deltaX; } // Positive when scrolling right.
     double deltaY() const { return m_deltaY; } // Positive when scrolling down.
@@ -111 +112 @@
     unsigned m_deltaMode;
     bool m_directionInvertedFromDevice;
+    std::unique_ptr<PlatformWheelEvent> m_wheelEvent;
 
 #if PLATFORM(MAC)