Changeset 60974 in webkit


Ignore:
Timestamp:
Jun 10, 2010 2:31:30 PM (14 years ago)
Author:
hyatt@apple.com
Message:

https://bugs.webkit.org/show_bug.cgi?id=40441, back out the original fix for 29601, since it has broken continuous
wheel delta values.

Reviewed by John Sullivan.

WebCore:

  • platform/mac/WebCoreSystemInterface.h:
  • platform/mac/WebCoreSystemInterface.mm:
  • platform/mac/WheelEventMac.mm:

(WebCore::PlatformWheelEvent::PlatformWheelEvent):

WebKit/mac:

  • WebView/WebDynamicScrollBarsView.mm:

(-[WebDynamicScrollBarsView scrollWheel:]):

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r60973 r60974  
     12010-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
    1132010-06-10  Abhishek Arya  <inferno@chromium.org>
    214
  • trunk/WebCore/platform/mac/WebCoreSystemInterface.h

    r57373 r60974  
    118118extern NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response);
    119119extern BOOL (*wkGetNSURLResponseMustRevalidate)(NSURLResponse *response);
    120 extern void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, float* wheelTicksX, float* wheelTicksY, BOOL* continuous);
     120extern void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, BOOL* continuous);
    121121extern BOOL (*wkHitTestMediaUIPart)(int part, int themeStyle, CGRect bounds, CGPoint point);
    122122extern void (*wkMeasureMediaUIPart)(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize);
  • trunk/WebCore/platform/mac/WebCoreSystemInterface.mm

    r57373 r60974  
    5353NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response);
    5454BOOL (*wkGetNSURLResponseMustRevalidate)(NSURLResponse *response);
    55 void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, float* wheelTicksX, float* wheelTicksY, BOOL* continuous);
     55void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, BOOL* continuous);
    5656void (*wkPopupMenu)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*);
    5757unsigned (*wkQTIncludeOnlyModernMediaFileTypes)(void);
  • trunk/WebCore/platform/mac/WheelEventMac.mm

    r56012 r60974  
    4444{
    4545    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    }
    4755
    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());
    5258}
    5359
  • trunk/WebKit/mac/ChangeLog

    r60895 r60974  
     12010-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
    1112010-06-09  Sheriff Bot  <webkit.review.bot@gmail.com>
    212
  • trunk/WebKit/mac/WebView/WebDynamicScrollBarsView.mm

    r59891 r60974  
    471471    float deltaX;
    472472    float deltaY;
    473     float wheelTicksX;
    474     float wheelTicksY;
    475473    BOOL isContinuous;
    476     WKGetWheelEventDeltas(event, &deltaX, &deltaY, &wheelTicksX, &wheelTicksY, &isContinuous);
     474    WKGetWheelEventDeltas(event, &deltaX, &deltaY, &isContinuous);
    477475
    478476    BOOL isLatchingEvent = WKIsLatchingWheelEvent(event);
Note: See TracChangeset for help on using the changeset viewer.