Changeset 76636 in webkit
- Timestamp:
- Jan 25, 2011 1:14:50 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r76633 r76636 1 2011-01-25 Sam Weinig <sam@webkit.org> 2 3 Reviewed by Anders Carlsson. 4 5 Pipe a timestamp down into the PlatformWheelEvent for the Mac. 6 https://bugs.webkit.org/show_bug.cgi?id=53111 7 8 * platform/PlatformWheelEvent.h: 9 (WebCore::PlatformWheelEvent::PlatformWheelEvent): 10 (WebCore::PlatformWheelEvent::timestamp): 11 Add timestamp member. 12 13 * platform/mac/WheelEventMac.mm: 14 (WebCore::PlatformWheelEvent::PlatformWheelEvent): 15 Initialize the timestamp from the event. 16 1 17 2011-01-25 Sheriff Bot <webkit.review.bot@gmail.com> 2 18 -
trunk/Source/WebCore/platform/PlatformWheelEvent.h
r76622 r76636 101 101 , m_hasPreciseScrollingDeltas(false) 102 102 , m_phase(PlatformWheelEventPhaseNone) 103 , m_timestamp(0) 103 104 #endif 104 105 { … … 154 155 PlatformWheelEventPhase phase() const { return m_phase; } 155 156 bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; } 157 double timestamp() const { return m_timestamp; } 156 158 #endif 157 159 … … 191 193 bool m_hasPreciseScrollingDeltas; 192 194 PlatformWheelEventPhase m_phase; 195 double m_timestamp; 193 196 #endif 194 197 }; -
trunk/Source/WebCore/platform/mac/WheelEventMac.mm
r76622 r76636 65 65 , m_metaKey([event modifierFlags] & NSCommandKeyMask) 66 66 , m_phase(phaseForEvent(event)) 67 , m_timestamp([event timestamp]) 67 68 { 68 69 BOOL continuous; -
trunk/Source/WebKit2/ChangeLog
r76634 r76636 12 12 (WebKit::WebPage::exitAcceleratedCompositingMode): 13 13 Call setRootCompositingLayer(0) so the drawing area knows when we leave accelerated compositing. 14 15 2011-01-25 Sam Weinig <sam@webkit.org> 16 17 Reviewed by Anders Carlsson. 18 19 Pipe a timestamp down into the PlatformWheelEvent for the Mac. 20 https://bugs.webkit.org/show_bug.cgi?id=53111 21 22 * Shared/WebEventConversion.cpp: 23 (WebKit::WebKit2PlatformWheelEvent::WebKit2PlatformWheelEvent): 24 Assign the timestamp. 14 25 15 26 2011-01-25 Sam Weinig <sam@webkit.org> -
trunk/Source/WebKit2/Shared/WebEventConversion.cpp
r76622 r76636 114 114 m_phase = static_cast<WebCore::PlatformWheelEventPhase>(webEvent.phase()); 115 115 m_hasPreciseScrollingDeltas = webEvent.hasPreciseScrollingDeltas(); 116 m_timestamp = webEvent.timestamp(); 116 117 #endif 117 118 }
Note: See TracChangeset
for help on using the changeset viewer.