Changeset 85428 in webkit


Ignore:
Timestamp:
May 1, 2011 12:46:01 PM (13 years ago)
Author:
rniwa@webkit.org
Message:

2011-05-01 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Eric Seidel.

Get rid of versions of sendContextMenuEvent and eventMayStartDrag that takes NSEvent
https://bugs.webkit.org/show_bug.cgi?id=59837

Removed EventHandler::sendContextMenuEvent(NSEvent*) and EventHandler::eventMayStartDrag(NSEvent*)

  • WebCore.exp.in:
  • page/EventHandler.h:
  • page/mac/EventHandlerMac.mm:

2011-05-01 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Eric Seidel.

Get rid of versions of sendContextMenuEvent and eventMayStartDrag that takes NSEvent
https://bugs.webkit.org/show_bug.cgi?id=59837

Call sendContextMenuEvent and eventMayStartDrag with PlatformMouseEvent instead of NSEvent.

  • WebView/WebHTMLView.mm: (-[WebHTMLView menuForEvent:]): (-[WebHTMLView acceptsFirstMouse:]): (-[WebHTMLView shouldDelayWindowOrderingForEvent:]):
Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r85425 r85428  
     12011-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
    1142011-05-01  Ryosuke Niwa  <rniwa@webkit.org>
    215
  • trunk/Source/WebCore/WebCore.exp.in

    r85425 r85428  
    489489__ZN7WebCore17nameForCursorTypeENS_6Cursor4TypeE
    490490__ZN7WebCore17openTemporaryFileERKN3WTF6StringERi
     491__ZN7WebCore18PlatformMouseEventC1EP7NSEventP6NSView
    491492__ZN7WebCore18PlatformStrategies26createLocalizationStrategyEv
    492493__ZN7WebCore18SearchPopupMenuMacC1EPNS_15PopupMenuClientE
     
    14761477#if ENABLE(CONTEXT_MENUS)
    14771478__ZN7WebCore11ContextMenu22setPlatformDescriptionEP14NSMutableArray
    1478 __ZN7WebCore12EventHandler20sendContextMenuEventEP7NSEvent
    14791479__ZN7WebCore12EventHandler20sendContextMenuEventERKNS_18PlatformMouseEventE
    14801480__ZN7WebCore15ContextMenuItem26releasePlatformDescriptionEv
     
    15051505#if ENABLE(DRAG_SUPPORT)
    15061506__ZN7WebCore12EventHandler17dragSourceEndedAtERKNS_18PlatformMouseEventENS_13DragOperationE
    1507 __ZN7WebCore12EventHandler17eventMayStartDragEP7NSEvent
    15081507__ZNK7WebCore12EventHandler17eventMayStartDragERKNS_18PlatformMouseEventE
    15091508__ZN7WebCore14DragController10dragExitedEPNS_8DragDataE
  • trunk/Source/WebCore/page/EventHandler.h

    r85425 r85428  
    215215    bool wheelEvent(NSEvent *);
    216216
    217 #if ENABLE(CONTEXT_MENUS)
    218     bool sendContextMenuEvent(NSEvent *);
    219 #endif
    220     bool eventMayStartDrag(NSEvent *);
    221 
    222217    void sendFakeEventsAfterWidgetTracking(NSEvent *initiatingEvent);
    223218
  • trunk/Source/WebCore/page/mac/EventHandlerMac.mm

    r85425 r85428  
    661661}
    662662
    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 
    683663bool EventHandler::eventActivatedView(const PlatformMouseEvent& event) const
    684664{
  • trunk/Source/WebKit/mac/ChangeLog

    r85425 r85428  
     12011-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
    1152011-05-01  Ryosuke Niwa  <rniwa@webkit.org>
    216
  • trunk/Source/WebKit/mac/WebView/WebHTMLView.mm

    r85425 r85428  
    7777#import <WebCore/CachedImage.h>
    7878#import <WebCore/CachedResourceClient.h>
     79#import <WebCore/Chrome.h>
    7980#import <WebCore/ColorMac.h>
    8081#import <WebCore/ContextMenu.h>
     
    31093110    page->contextMenuController()->clearContextMenu();
    31103111    coreFrame->eventHandler()->mouseDown(event);
    3111     BOOL handledEvent = coreFrame->eventHandler()->sendContextMenuEvent(event);
     3112    BOOL handledEvent = coreFrame->eventHandler()->sendContextMenuEvent(PlatformMouseEvent(event, page->chrome()->platformPageClient()));
    31123113    _private->handlingMouseDownEvent = NO;
    31133114
     
    34263427            coreFrame->eventHandler()->setActivationEventNumber([event eventNumber]);
    34273428            [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])
    34313433                result = true;
    34323434            [hitHTMLView _setMouseDownEvent:nil];
     
    34513453            if (Frame* coreFrame = core([hitHTMLView _frame])) {
    34523454                [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()));
    34543457                [hitHTMLView _setMouseDownEvent:nil];
    34553458            }
Note: See TracChangeset for help on using the changeset viewer.