diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 23:51:17 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 23:51:17 +0000 |
| commit | 33c2fe361c124e5d011c8ac3e003b7c8662904ad (patch) | |
| tree | afff72ab21b75ac1e90e58860009bb546d6e7513 /content/shell/tools | |
| parent | 785c71fe215f65b36d587a0b64a06aec70dee060 (diff) | |
| download | chromium_src-33c2fe361c124e5d011c8ac3e003b7c8662904ad.zip chromium_src-33c2fe361c124e5d011c8ac3e003b7c8662904ad.tar.gz chromium_src-33c2fe361c124e5d011c8ac3e003b7c8662904ad.tar.bz2 | |
Fix 64 bit Mac build issue.
NPEventModelCarbon does not exist when NP_NO_CARBON.
BUG=none
Review URL: https://codereview.chromium.org/212993006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/tools')
| -rw-r--r-- | content/shell/tools/plugin/main.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/content/shell/tools/plugin/main.cpp b/content/shell/tools/plugin/main.cpp index 0a4c3b8..6cfab1c 100644 --- a/content/shell/tools/plugin/main.cpp +++ b/content/shell/tools/plugin/main.cpp @@ -792,14 +792,16 @@ int16_t NPP_HandleEvent(NPP instance, void *event) int16_t ret = 0; #ifdef XP_MACOSX #ifndef NP_NO_CARBON - if (obj->eventModel == NPEventModelCarbon) - ret = handleEventCarbon(instance, obj, static_cast<EventRecord*>(event)); -#endif assert(obj->eventModel == NPEventModelCarbon || obj->eventModel == NPEventModelCocoa); if (obj->eventModel == NPEventModelCocoa) - ret = handleEventCocoa(instance, obj, static_cast<NPCocoaEvent*>(event)); - + ret = handleEventCocoa(instance, obj, static_cast<NPCocoaEvent*>(event)); + else if (obj->eventModel == NPEventModelCarbon) + ret = handleEventCarbon(instance, obj, static_cast<EventRecord*>(event)); +#else + assert(obj->eventModel == NPEventModelCocoa); + ret = handleEventCocoa(instance, obj, static_cast<NPCocoaEvent*>(event)); +#endif #elif defined(XP_UNIX) ret = handleEventX11(instance, obj, static_cast<XEvent*>(event)); #elif defined(XP_WIN) |