OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 m_webExternalPopupMenu = webframe->client()->createExternalPopupMenu(info, t
his); | 90 m_webExternalPopupMenu = webframe->client()->createExternalPopupMenu(info, t
his); |
91 if (m_webExternalPopupMenu) { | 91 if (m_webExternalPopupMenu) { |
92 IntRect rectInViewport = m_localFrame->view()->soonToBeRemovedContentsTo
UnscaledViewport(rect); | 92 IntRect rectInViewport = m_localFrame->view()->soonToBeRemovedContentsTo
UnscaledViewport(rect); |
93 m_webExternalPopupMenu->show(rectInViewport); | 93 m_webExternalPopupMenu->show(rectInViewport); |
94 #if OS(MACOSX) | 94 #if OS(MACOSX) |
95 const WebInputEvent* currentEvent = WebViewImpl::currentInputEvent(); | 95 const WebInputEvent* currentEvent = WebViewImpl::currentInputEvent(); |
96 if (currentEvent && currentEvent->type == WebInputEvent::MouseDown) { | 96 if (currentEvent && currentEvent->type == WebInputEvent::MouseDown) { |
97 m_syntheticEvent = adoptPtr(new WebMouseEvent); | 97 m_syntheticEvent = adoptPtr(new WebMouseEvent); |
98 *m_syntheticEvent = *static_cast<const WebMouseEvent*>(currentEvent)
; | 98 *m_syntheticEvent = *static_cast<const WebMouseEvent*>(currentEvent)
; |
99 m_syntheticEvent->type = WebInputEvent::MouseUp; | 99 m_syntheticEvent->type = WebInputEvent::MouseUp; |
100 m_dispatchEventTimer.startOneShot(0, FROM_HERE); | 100 m_dispatchEventTimer.startOneShot(0, BLINK_FROM_HERE); |
101 // FIXME: show() is asynchronous. If preparing a popup is slow and | 101 // FIXME: show() is asynchronous. If preparing a popup is slow and |
102 // a user released the mouse button before showing the popup, | 102 // a user released the mouse button before showing the popup, |
103 // mouseup and click events are correctly dispatched. Dispatching | 103 // mouseup and click events are correctly dispatched. Dispatching |
104 // the synthetic mouseup event is redundant in this case. | 104 // the synthetic mouseup event is redundant in this case. |
105 } | 105 } |
106 #endif | 106 #endif |
107 } else { | 107 } else { |
108 // The client might refuse to create a popup (when there is already one
pending to be shown for example). | 108 // The client might refuse to create a popup (when there is already one
pending to be shown for example). |
109 didCancel(); | 109 didCancel(); |
110 } | 110 } |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 if (ownerElement.itemIsDisplayNone(*items[i])) | 257 if (ownerElement.itemIsDisplayNone(*items[i])) |
258 continue; | 258 continue; |
259 if (popupMenuItemIndex == i) | 259 if (popupMenuItemIndex == i) |
260 return indexTracker; | 260 return indexTracker; |
261 ++indexTracker; | 261 ++indexTracker; |
262 } | 262 } |
263 return -1; | 263 return -1; |
264 } | 264 } |
265 | 265 |
266 } // namespace blink | 266 } // namespace blink |
OLD | NEW |