Changeset 162731 in webkit


Ignore:
Timestamp:
Jan 24, 2014 3:29:29 PM (10 years ago)
Author:
Simon Fraser
Message:

​https://bugs.webkit.org/show_bug.cgi?id=127583

Reviewed by Tim Horton.

handleWheelEventPhase() doesn't make any sense for iOS, which
has no wheel events.

Source/WebCore:

  • page/scrolling/ScrollingTree.h:
  • page/scrolling/ThreadedScrollingTree.cpp:
  • page/scrolling/ThreadedScrollingTree.h:
  • page/scrolling/ios/ScrollingTreeIOS.h:

Source/WebKit2:

  • UIProcess/Scrolling/RemoteScrollingTree.cpp:
  • UIProcess/Scrolling/RemoteScrollingTree.h:
Location:
trunk/Source
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r162726 r162731  
     12014-01-24  Simon Fraser  <simon.fraser@apple.com>
     2
     3        #ifdef out handleWheelEventPhase for iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=127583
     5
     6        Reviewed by Tim Horton.
     7
     8        handleWheelEventPhase() doesn't make any sense for iOS, which
     9        has no wheel events.
     10
     11        * page/scrolling/ScrollingTree.h:
     12        * page/scrolling/ThreadedScrollingTree.cpp:
     13        * page/scrolling/ThreadedScrollingTree.h:
     14        * page/scrolling/ios/ScrollingTreeIOS.h:
     15
    1162014-01-24  David Hyatt  <hyatt@apple.com>
    217

  • trunk/Source/WebCore/page/scrolling/ScrollingTree.h

    r161610 r162731  
    7575    IntPoint mainFrameScrollPosition();
    7676
    77 #if PLATFORM(MAC)
     77#if PLATFORM(MAC) && !PLATFORM(IOS)
    7878    virtual void handleWheelEventPhase(PlatformWheelEventPhase) = 0;
    7979#endif

  • trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp

    r161276 r162731  
    111111}
    112112
    113 #if PLATFORM(MAC)
     113#if PLATFORM(MAC) && !PLATFORM(IOS)
    114114void ThreadedScrollingTree::handleWheelEventPhase(PlatformWheelEventPhase phase)
    115115{

  • trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h

    r162139 r162731  
    6666
    6767    virtual void updateMainFrameScrollPosition(const IntPoint& scrollPosition, SetOrSyncScrollingLayerPosition = SyncScrollingLayerPosition) override;
    68 #if PLATFORM(MAC)
     68#if PLATFORM(MAC) && !PLATFORM(IOS)
    6969    virtual void handleWheelEventPhase(PlatformWheelEventPhase) override;
    7070#endif

  • trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h

    r162139 r162731  
    5858
    5959    virtual void updateMainFrameScrollPosition(const IntPoint& scrollPosition, SetOrSyncScrollingLayerPosition = SyncScrollingLayerPosition) override;
    60 #if PLATFORM(MAC)
    61     virtual void handleWheelEventPhase(PlatformWheelEventPhase) override { }
    62 #endif
    6360
    6461    RefPtr<AsyncScrollingCoordinator> m_scrollingCoordinator;

  • trunk/Source/WebKit2/ChangeLog

    r162730 r162731  
     12014-01-24  Simon Fraser  <simon.fraser@apple.com>
     2
     3        #ifdef out handleWheelEventPhase for iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=127583
     5
     6        Reviewed by Tim Horton.
     7
     8        handleWheelEventPhase() doesn't make any sense for iOS, which
     9        has no wheel events.
     10
     11        * UIProcess/Scrolling/RemoteScrollingTree.cpp:
     12        * UIProcess/Scrolling/RemoteScrollingTree.h:
     13
    1142014-01-24  Simon Fraser  <simon.fraser@apple.com>
    215

  • trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp

    r161610 r162731  
    7070}
    7171
    72 #if PLATFORM(MAC)
     72#if PLATFORM(MAC) && !PLATFORM(IOS)
    7373void RemoteScrollingTree::handleWheelEventPhase(PlatformWheelEventPhase phase)
    7474{

  • trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h

    r162139 r162731  
    5050    explicit RemoteScrollingTree(RemoteScrollingCoordinatorProxy&);
    5151
    52 #if PLATFORM(MAC)
     52#if PLATFORM(MAC) && !PLATFORM(IOS)
    5353    virtual void handleWheelEventPhase(WebCore::PlatformWheelEventPhase) override;
    5454#endif
Note: See TracChangeset for help on using the changeset viewer.