Changeset 60974 in webkit
- Timestamp:
- Jun 10, 2010 2:31:30 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r60973 r60974 1 2010-06-10 David Hyatt <hyatt@apple.com> 2 3 Reviewed by John Sullivan. 4 5 https://bugs.webkit.org/show_bug.cgi?id=40441, back out the original fix for 29601, since it has broken continuous 6 wheel delta values. 7 8 * platform/mac/WebCoreSystemInterface.h: 9 * platform/mac/WebCoreSystemInterface.mm: 10 * platform/mac/WheelEventMac.mm: 11 (WebCore::PlatformWheelEvent::PlatformWheelEvent): 12 1 13 2010-06-10 Abhishek Arya <inferno@chromium.org> 2 14 -
trunk/WebCore/platform/mac/WebCoreSystemInterface.h
r57373 r60974 118 118 extern NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response); 119 119 extern BOOL (*wkGetNSURLResponseMustRevalidate)(NSURLResponse *response); 120 extern void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, float* wheelTicksX, float* wheelTicksY,BOOL* continuous);120 extern void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, BOOL* continuous); 121 121 extern BOOL (*wkHitTestMediaUIPart)(int part, int themeStyle, CGRect bounds, CGPoint point); 122 122 extern void (*wkMeasureMediaUIPart)(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize); -
trunk/WebCore/platform/mac/WebCoreSystemInterface.mm
r57373 r60974 53 53 NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response); 54 54 BOOL (*wkGetNSURLResponseMustRevalidate)(NSURLResponse *response); 55 void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, float* wheelTicksX, float* wheelTicksY,BOOL* continuous);55 void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, BOOL* continuous); 56 56 void (*wkPopupMenu)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*); 57 57 unsigned (*wkQTIncludeOnlyModernMediaFileTypes)(void); -
trunk/WebCore/platform/mac/WheelEventMac.mm
r56012 r60974 44 44 { 45 45 BOOL continuous; 46 wkGetWheelEventDeltas(event, &m_deltaX, &m_deltaY, &m_wheelTicksX, &m_wheelTicksY, &continuous); 46 47 wkGetWheelEventDeltas(event, &m_deltaX, &m_deltaY, &continuous); 48 if (continuous) { 49 m_wheelTicksX = m_deltaX / static_cast<float>(Scrollbar::pixelsPerLineStep()); 50 m_wheelTicksY = m_deltaY / static_cast<float>(Scrollbar::pixelsPerLineStep()); 51 } else { 52 m_wheelTicksX = m_deltaX; 53 m_wheelTicksY = m_deltaY; 54 } 47 55 48 if (!continuous) { 49 m_deltaX *= static_cast<float>(Scrollbar::pixelsPerLineStep()); 50 m_deltaY *= static_cast<float>(Scrollbar::pixelsPerLineStep()); 51 } 56 m_deltaX *= static_cast<float>(Scrollbar::pixelsPerLineStep()); 57 m_deltaY *= static_cast<float>(Scrollbar::pixelsPerLineStep()); 52 58 } 53 59 -
trunk/WebKit/mac/ChangeLog
r60895 r60974 1 2010-06-10 David Hyatt <hyatt@apple.com> 2 3 Reviewed by John Sullivan. 4 5 https://bugs.webkit.org/show_bug.cgi?id=40441, back out the original fix for 29601, since it has broken continuous 6 wheel delta values. 7 8 * WebView/WebDynamicScrollBarsView.mm: 9 (-[WebDynamicScrollBarsView scrollWheel:]): 10 1 11 2010-06-09 Sheriff Bot <webkit.review.bot@gmail.com> 2 12 -
trunk/WebKit/mac/WebView/WebDynamicScrollBarsView.mm
r59891 r60974 471 471 float deltaX; 472 472 float deltaY; 473 float wheelTicksX;474 float wheelTicksY;475 473 BOOL isContinuous; 476 WKGetWheelEventDeltas(event, &deltaX, &deltaY, & wheelTicksX, &wheelTicksY, &isContinuous);474 WKGetWheelEventDeltas(event, &deltaX, &deltaY, &isContinuous); 477 475 478 476 BOOL isLatchingEvent = WKIsLatchingWheelEvent(event);
Note: See TracChangeset
for help on using the changeset viewer.