Changeset 21042 in webkit


Ignore:
Timestamp:
Apr 23, 2007 10:07:09 AM (17 years ago)
Author:
andersca
Message:

Reviewed by Ada.

<rdar://problem/5061022>
REGRESSION: Acrobat 8 plug-in fails to scroll with trackpad two-finger scroll or mouse wheel (12995)


Pass wheel events to all widgets.


  • page/EventHandler.cpp: (WebCore::EventHandler::handleWheelEvent):
  • page/EventHandler.h:
  • page/mac/EventHandlerMac.mm: (WebCore::EventHandler::passWheelEventToWidget):
Location:
trunk/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r21041 r21042  
     12007-04-23  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Ada.
     4
     5        <rdar://problem/5061022>
     6        REGRESSION: Acrobat 8 plug-in fails to scroll with trackpad two-finger scroll or mouse wheel (12995)
     7       
     8        Pass wheel events to all widgets.
     9       
     10        * page/EventHandler.cpp:
     11        (WebCore::EventHandler::handleWheelEvent):
     12        * page/EventHandler.h:
     13        * page/mac/EventHandlerMac.mm:
     14        (WebCore::EventHandler::passWheelEventToWidget):
     15
    1162007-04-23  Alp Toker  <alp@atoker.com>
    217
  • trunk/WebCore/page/EventHandler.cpp

    r20995 r21042  
    11991199    HitTestResult result(vPoint);
    12001200    doc->renderer()->layer()->hitTest(request, result);
    1201     Node* node = result.innerNode();   
    1202     Frame* subframe = subframeForTargetNode(node);
    1203     if (subframe && passWheelEventToSubframe(e, subframe)) {
    1204         e.accept();
    1205         return true;
    1206     }
    1207 
     1201    Node* node = result.innerNode();
     1202   
    12081203    if (node) {
     1204        // Figure out which view to send the event to.
     1205        RenderObject* target = node->renderer();
     1206       
     1207        if (target && target->isWidget() &&
     1208            passWheelEventToWidget(e, static_cast<RenderWidget*>(target)->widget())) {
     1209            e.accept();
     1210            return true;
     1211        }
     1212
    12091213        node = node->shadowAncestorNode();
    12101214        EventTargetNodeCast(node)->dispatchWheelEvent(e);
  • trunk/WebCore/page/EventHandler.h

    r20798 r21042  
    223223    bool passMouseMoveEventToSubframe(MouseEventWithHitTestResults&, Frame* subframe);
    224224    bool passMouseReleaseEventToSubframe(MouseEventWithHitTestResults&, Frame* subframe);
    225     bool passWheelEventToSubframe(PlatformWheelEvent&, Frame* subframe);
    226225
    227226    bool passSubframeEventToSubframe(MouseEventWithHitTestResults&, Frame* subframe);
     
    233232
    234233    bool passMouseDownEventToWidget(Widget*);
    235     bool passWheelEventToWidget(Widget*);
     234    bool passWheelEventToWidget(PlatformWheelEvent&, Widget*);
    236235
    237236    void defaultTabEventHandler(Event*, bool isBackTab);
  • trunk/WebCore/page/mac/EventHandlerMac.mm

    r19940 r21042  
    425425}
    426426
    427 bool EventHandler::passWheelEventToWidget(Widget* widget)
     427bool EventHandler::passWheelEventToWidget(PlatformWheelEvent&, Widget* widget)
    428428{
    429429    BEGIN_BLOCK_OBJC_EXCEPTIONS;
     
    624624}
    625625
    626 bool EventHandler::passWheelEventToSubframe(PlatformWheelEvent&, Frame* subframe)
    627 {
    628     return passWheelEventToWidget(subframe->view());
    629 }
    630 
    631626bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults&, PlatformScrollbar* scrollbar)
    632627{
Note: See TracChangeset for help on using the changeset viewer.