| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 bool WebPopupMenuImpl::handleTouchEvent(const WebTouchEvent& event) | 152 bool WebPopupMenuImpl::handleTouchEvent(const WebTouchEvent& event) |
| 153 { | 153 { |
| 154 | 154 |
| 155 PlatformTouchEventBuilder touchEventBuilder(m_widget, event); | 155 PlatformTouchEventBuilder touchEventBuilder(m_widget, event); |
| 156 bool defaultPrevented(m_widget->handleTouchEvent(touchEventBuilder)); | 156 bool defaultPrevented(m_widget->handleTouchEvent(touchEventBuilder)); |
| 157 return defaultPrevented; | 157 return defaultPrevented; |
| 158 } | 158 } |
| 159 | 159 |
| 160 bool WebPopupMenuImpl::handleKeyEvent(const WebKeyboardEvent& event) | 160 bool WebPopupMenuImpl::handleKeyEvent(const WebKeyboardEvent& event) |
| 161 { | 161 { |
| 162 return m_widget->handleKeyEvent(PlatformKeyboardEventBuilder(event)); | 162 return m_widget->handleKeyEvent(PlatformKeyboardEventBuilder(m_widget, event
)); |
| 163 } | 163 } |
| 164 | 164 |
| 165 // WebWidget ------------------------------------------------------------------- | 165 // WebWidget ------------------------------------------------------------------- |
| 166 | 166 |
| 167 void WebPopupMenuImpl::close() | 167 void WebPopupMenuImpl::close() |
| 168 { | 168 { |
| 169 if (m_widget) | 169 if (m_widget) |
| 170 m_widget->hide(); | 170 m_widget->hide(); |
| 171 | 171 |
| 172 m_client = 0; | 172 m_client = 0; |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 ASSERT(widget == m_widget); | 401 ASSERT(widget == m_widget); |
| 402 if (m_widget) { | 402 if (m_widget) { |
| 403 m_widget->setClient(0); | 403 m_widget->setClient(0); |
| 404 m_widget = 0; | 404 m_widget = 0; |
| 405 } | 405 } |
| 406 if (m_client) | 406 if (m_client) |
| 407 m_client->closeWidgetSoon(); | 407 m_client->closeWidgetSoon(); |
| 408 } | 408 } |
| 409 | 409 |
| 410 } // namespace blink | 410 } // namespace blink |
| OLD | NEW |