Changeset 69979 in webkit


Ignore:
Timestamp:
Oct 18, 2010 11:54:06 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-10-18 Stuart Morgan <​stuartmorgan@chromium.org>

Reviewed by Eric Seidel.

Switch to using the new Carbon NPAPI event declarations, and remove
the old ones.

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

  • bridge/npapi.h:
  • plugins/mac/PluginViewMac.mm: (WebCore::PluginView::setFocus): (WebCore::PluginView::handleMouseEvent):

2010-10-18 Stuart Morgan <​stuartmorgan@chromium.org>

Reviewed by Eric Seidel.

Switch to using the new Carbon NPAPI event declarations, and remove
the old ones.

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

  • Plugins/WebNetscapePluginEventHandlerCarbon.mm: (WebNetscapePluginEventHandlerCarbon::mouseEntered): (WebNetscapePluginEventHandlerCarbon::mouseExited): (WebNetscapePluginEventHandlerCarbon::mouseMoved): (WebNetscapePluginEventHandlerCarbon::focusChanged):

2010-10-18 Stuart Morgan <​stuartmorgan@chromium.org>

Reviewed by Eric Seidel.

Switch to using the new Carbon NPAPI event declarations, and remove
the old ones.

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

  • DumpRenderTree/TestNetscapePlugIn/main.cpp: (handleEventCarbon):
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r69976 r69979  
     12010-10-18  Stuart Morgan  <stuartmorgan@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Switch to using the new Carbon NPAPI event declarations, and remove
     6        the old ones.
     7
     8        https://bugs.webkit.org/show_bug.cgi?id=40784
     9
     10        * bridge/npapi.h:
     11        * plugins/mac/PluginViewMac.mm:
     12        (WebCore::PluginView::setFocus):
     13        (WebCore::PluginView::handleMouseEvent):
     14
    1152010-10-18  Pavel Feldman  <pfeldman@chromium.org>
    216

  • trunk/WebCore/bridge/npapi.h

    r68390 r69979  
    677677  NPEventType_ScrollingEndsEvent
    678678};
    679 /* Obsolete versions of the above */
    680 #define getFocusEvent        (osEvt + 16)
    681 #define loseFocusEvent        (osEvt + 17)
    682 #define adjustCursorEvent   (osEvt + 18)
    683679#endif /* NP_NO_CARBON */
    684680

  • trunk/WebCore/plugins/mac/PluginViewMac.mm

    r65067 r69979  
    360360#ifndef NP_NO_CARBON
    361361    EventRecord record;
    362     record.what = getFocusEvent;
     362    record.what = NPEventType_GetFocusEvent;
    363363    record.message = 0;
    364364    record.when = TickCount();
    … …  
    577577        return;
    578578    } else if (event->type() == eventNames().mouseoverEvent) {
    579         record.what = adjustCursorEvent;
     579        record.what = NPEventType_AdjustCursorEvent;
    580580    } else if (event->type() == eventNames().mouseoutEvent) {
    581         record.what = adjustCursorEvent;
     581        record.what = NPEventType_AdjustCursorEvent;
    582582    } else if (event->type() == eventNames().mousedownEvent) {
    583583        record.what = mouseDown;
    … …  
    601601
    602602    if (!dispatchNPEvent(record)) {
    603         if (record.what == adjustCursorEvent)
     603        if (record.what == NPEventType_AdjustCursorEvent)
    604604            return; // Signals that the plugin wants a normal cursor
    605605

  • trunk/WebKit/mac/ChangeLog

    r69969 r69979  
     12010-10-18  Stuart Morgan  <stuartmorgan@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Switch to using the new Carbon NPAPI event declarations, and remove
     6        the old ones.
     7
     8        https://bugs.webkit.org/show_bug.cgi?id=40784
     9
     10        * Plugins/WebNetscapePluginEventHandlerCarbon.mm:
     11        (WebNetscapePluginEventHandlerCarbon::mouseEntered):
     12        (WebNetscapePluginEventHandlerCarbon::mouseExited):
     13        (WebNetscapePluginEventHandlerCarbon::mouseMoved):
     14        (WebNetscapePluginEventHandlerCarbon::focusChanged):
     15
    1162010-10-18  Pavel Podivilov  <podivilov@chromium.org>
    217

  • trunk/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm

    r55041 r69979  
    175175   
    176176    getCarbonEvent(&event, theEvent);
    177     event.what = adjustCursorEvent;
     177    event.what = NPEventType_AdjustCursorEvent;
    178178   
    179179    BOOL acceptedEvent;
    … …  
    188188   
    189189    getCarbonEvent(&event, theEvent);
    190     event.what = adjustCursorEvent;
     190    event.what = NPEventType_AdjustCursorEvent;
    191191   
    192192    BOOL acceptedEvent;
    … …  
    205205   
    206206    getCarbonEvent(&event, theEvent);
    207     event.what = adjustCursorEvent;
     207    event.what = NPEventType_AdjustCursorEvent;
    208208   
    209209    BOOL acceptedEvent;
    … …  
    272272    bool acceptedEvent;
    273273    if (hasFocus) {
    274         event.what = getFocusEvent;
     274        event.what = NPEventType_GetFocusEvent;
    275275        acceptedEvent = sendEvent(&event);
    276         LOG(PluginEvents, "NPP_HandleEvent(getFocusEvent): %d", acceptedEvent);
     276        LOG(PluginEvents, "NPP_HandleEvent(NPEventType_GetFocusEvent): %d", acceptedEvent);
    277277        installKeyEventHandler();
    278278    } else {
    279         event.what = loseFocusEvent;
     279        event.what = NPEventType_LoseFocusEvent;
    280280        acceptedEvent = sendEvent(&event);
    281         LOG(PluginEvents, "NPP_HandleEvent(loseFocusEvent): %d", acceptedEvent);
     281        LOG(PluginEvents, "NPP_HandleEvent(NPEventType_LoseFocusEvent): %d", acceptedEvent);
    282282        removeKeyEventHandler();
    283283    }

  • trunk/WebKitTools/ChangeLog

    r69955 r69979  
     12010-10-18  Stuart Morgan  <stuartmorgan@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Switch to using the new Carbon NPAPI event declarations, and remove
     6        the old ones.
     7
     8        https://bugs.webkit.org/show_bug.cgi?id=40784
     9
     10        * DumpRenderTree/TestNetscapePlugIn/main.cpp:
     11        (handleEventCarbon):
     12
    1132010-10-18  David Levin  <levin@chromium.org>
    214

  • trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp

    r69870 r69979  
    463463            break;
    464464        // NPAPI events
    465         case getFocusEvent:
     465        case NPEventType_LoseFocusEvent:
    466466            pluginLog(instance, "getFocusEvent");
    467467            break;
    468         case loseFocusEvent:
     468        case NPEventType_LoseFocusEvent:
    469469            pluginLog(instance, "loseFocusEvent");
    470470            break;
    471         case adjustCursorEvent:
     471        case NPEventType_AdjustCursorEvent:
    472472            pluginLog(instance, "adjustCursorEvent");
    473473            break;
Note: See TracChangeset for help on using the changeset viewer.