Changeset 21042 in webkit
- Timestamp:
- Apr 23, 2007 10:07:09 AM (17 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r21041 r21042 1 2007-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 1 16 2007-04-23 Alp Toker <alp@atoker.com> 2 17 -
trunk/WebCore/page/EventHandler.cpp
r20995 r21042 1199 1199 HitTestResult result(vPoint); 1200 1200 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 1208 1203 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 1209 1213 node = node->shadowAncestorNode(); 1210 1214 EventTargetNodeCast(node)->dispatchWheelEvent(e); -
trunk/WebCore/page/EventHandler.h
r20798 r21042 223 223 bool passMouseMoveEventToSubframe(MouseEventWithHitTestResults&, Frame* subframe); 224 224 bool passMouseReleaseEventToSubframe(MouseEventWithHitTestResults&, Frame* subframe); 225 bool passWheelEventToSubframe(PlatformWheelEvent&, Frame* subframe);226 225 227 226 bool passSubframeEventToSubframe(MouseEventWithHitTestResults&, Frame* subframe); … … 233 232 234 233 bool passMouseDownEventToWidget(Widget*); 235 bool passWheelEventToWidget( Widget*);234 bool passWheelEventToWidget(PlatformWheelEvent&, Widget*); 236 235 237 236 void defaultTabEventHandler(Event*, bool isBackTab); -
trunk/WebCore/page/mac/EventHandlerMac.mm
r19940 r21042 425 425 } 426 426 427 bool EventHandler::passWheelEventToWidget( Widget* widget)427 bool EventHandler::passWheelEventToWidget(PlatformWheelEvent&, Widget* widget) 428 428 { 429 429 BEGIN_BLOCK_OBJC_EXCEPTIONS; … … 624 624 } 625 625 626 bool EventHandler::passWheelEventToSubframe(PlatformWheelEvent&, Frame* subframe)627 {628 return passWheelEventToWidget(subframe->view());629 }630 631 626 bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults&, PlatformScrollbar* scrollbar) 632 627 {
Note: See TracChangeset
for help on using the changeset viewer.