Changeset 85428 in webkit
- Timestamp:
- May 1, 2011 12:46:01 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r85425 r85428 1 2011-05-01 Ryosuke Niwa <rniwa@webkit.org> 2 3 Reviewed by Eric Seidel. 4 5 Get rid of versions of sendContextMenuEvent and eventMayStartDrag that takes NSEvent 6 https://bugs.webkit.org/show_bug.cgi?id=59837 7 8 Removed EventHandler::sendContextMenuEvent(NSEvent*) and EventHandler::eventMayStartDrag(NSEvent*) 9 10 * WebCore.exp.in: 11 * page/EventHandler.h: 12 * page/mac/EventHandlerMac.mm: 13 1 14 2011-05-01 Ryosuke Niwa <rniwa@webkit.org> 2 15 -
trunk/Source/WebCore/WebCore.exp.in
r85425 r85428 489 489 __ZN7WebCore17nameForCursorTypeENS_6Cursor4TypeE 490 490 __ZN7WebCore17openTemporaryFileERKN3WTF6StringERi 491 __ZN7WebCore18PlatformMouseEventC1EP7NSEventP6NSView 491 492 __ZN7WebCore18PlatformStrategies26createLocalizationStrategyEv 492 493 __ZN7WebCore18SearchPopupMenuMacC1EPNS_15PopupMenuClientE … … 1476 1477 #if ENABLE(CONTEXT_MENUS) 1477 1478 __ZN7WebCore11ContextMenu22setPlatformDescriptionEP14NSMutableArray 1478 __ZN7WebCore12EventHandler20sendContextMenuEventEP7NSEvent1479 1479 __ZN7WebCore12EventHandler20sendContextMenuEventERKNS_18PlatformMouseEventE 1480 1480 __ZN7WebCore15ContextMenuItem26releasePlatformDescriptionEv … … 1505 1505 #if ENABLE(DRAG_SUPPORT) 1506 1506 __ZN7WebCore12EventHandler17dragSourceEndedAtERKNS_18PlatformMouseEventENS_13DragOperationE 1507 __ZN7WebCore12EventHandler17eventMayStartDragEP7NSEvent1508 1507 __ZNK7WebCore12EventHandler17eventMayStartDragERKNS_18PlatformMouseEventE 1509 1508 __ZN7WebCore14DragController10dragExitedEPNS_8DragDataE -
trunk/Source/WebCore/page/EventHandler.h
r85425 r85428 215 215 bool wheelEvent(NSEvent *); 216 216 217 #if ENABLE(CONTEXT_MENUS)218 bool sendContextMenuEvent(NSEvent *);219 #endif220 bool eventMayStartDrag(NSEvent *);221 222 217 void sendFakeEventsAfterWidgetTracking(NSEvent *initiatingEvent); 223 218 -
trunk/Source/WebCore/page/mac/EventHandlerMac.mm
r85425 r85428 661 661 } 662 662 663 #if ENABLE(CONTEXT_MENUS)664 bool EventHandler::sendContextMenuEvent(NSEvent *event)665 {666 Page* page = m_frame->page();667 if (!page)668 return false;669 return sendContextMenuEvent(PlatformMouseEvent(event, page->chrome()->platformPageClient()));670 }671 #endif // ENABLE(CONTEXT_MENUS)672 673 #if ENABLE(DRAG_SUPPORT)674 bool EventHandler::eventMayStartDrag(NSEvent *event)675 {676 Page* page = m_frame->page();677 if (!page)678 return false;679 return eventMayStartDrag(PlatformMouseEvent(event, page->chrome()->platformPageClient()));680 }681 #endif // ENABLE(DRAG_SUPPORT)682 683 663 bool EventHandler::eventActivatedView(const PlatformMouseEvent& event) const 684 664 { -
trunk/Source/WebKit/mac/ChangeLog
r85425 r85428 1 2011-05-01 Ryosuke Niwa <rniwa@webkit.org> 2 3 Reviewed by Eric Seidel. 4 5 Get rid of versions of sendContextMenuEvent and eventMayStartDrag that takes NSEvent 6 https://bugs.webkit.org/show_bug.cgi?id=59837 7 8 Call sendContextMenuEvent and eventMayStartDrag with PlatformMouseEvent instead of NSEvent. 9 10 * WebView/WebHTMLView.mm: 11 (-[WebHTMLView menuForEvent:]): 12 (-[WebHTMLView acceptsFirstMouse:]): 13 (-[WebHTMLView shouldDelayWindowOrderingForEvent:]): 14 1 15 2011-05-01 Ryosuke Niwa <rniwa@webkit.org> 2 16 -
trunk/Source/WebKit/mac/WebView/WebHTMLView.mm
r85425 r85428 77 77 #import <WebCore/CachedImage.h> 78 78 #import <WebCore/CachedResourceClient.h> 79 #import <WebCore/Chrome.h> 79 80 #import <WebCore/ColorMac.h> 80 81 #import <WebCore/ContextMenu.h> … … 3109 3110 page->contextMenuController()->clearContextMenu(); 3110 3111 coreFrame->eventHandler()->mouseDown(event); 3111 BOOL handledEvent = coreFrame->eventHandler()->sendContextMenuEvent( event);3112 BOOL handledEvent = coreFrame->eventHandler()->sendContextMenuEvent(PlatformMouseEvent(event, page->chrome()->platformPageClient())); 3112 3113 _private->handlingMouseDownEvent = NO; 3113 3114 … … 3426 3427 coreFrame->eventHandler()->setActivationEventNumber([event eventNumber]); 3427 3428 [hitHTMLView _setMouseDownEvent:event]; 3428 if ([hitHTMLView _isSelectionEvent:event]) 3429 result = coreFrame->eventHandler()->eventMayStartDrag(event); 3430 else if ([hitHTMLView _isScrollBarEvent:event]) 3429 if ([hitHTMLView _isSelectionEvent:event]) { 3430 if (Page* page = coreFrame->page()) 3431 result = coreFrame->eventHandler()->eventMayStartDrag(PlatformMouseEvent(event, page->chrome()->platformPageClient())); 3432 } else if ([hitHTMLView _isScrollBarEvent:event]) 3431 3433 result = true; 3432 3434 [hitHTMLView _setMouseDownEvent:nil]; … … 3451 3453 if (Frame* coreFrame = core([hitHTMLView _frame])) { 3452 3454 [hitHTMLView _setMouseDownEvent:event]; 3453 result = coreFrame->eventHandler()->eventMayStartDrag(event); 3455 if (Page* page = coreFrame->page()) 3456 result = coreFrame->eventHandler()->eventMayStartDrag(PlatformMouseEvent(event, page->chrome()->platformPageClient())); 3454 3457 [hitHTMLView _setMouseDownEvent:nil]; 3455 3458 }
Note: See TracChangeset
for help on using the changeset viewer.