Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(878)

Side by Side Diff: Source/WebKit/chromium/src/WebPopupMenuImpl.cpp

Issue 14280004: Revert removal of events (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 void WebPopupMenuImpl::handleMouseWheel(const WebMouseWheelEvent& event) 123 void WebPopupMenuImpl::handleMouseWheel(const WebMouseWheelEvent& event)
124 { 124 {
125 m_widget->handleWheelEvent(PlatformWheelEventBuilder(m_widget, event)); 125 m_widget->handleWheelEvent(PlatformWheelEventBuilder(m_widget, event));
126 } 126 }
127 127
128 bool WebPopupMenuImpl::handleGestureEvent(const WebGestureEvent& event) 128 bool WebPopupMenuImpl::handleGestureEvent(const WebGestureEvent& event)
129 { 129 {
130 return m_widget->handleGestureEvent(PlatformGestureEventBuilder(m_widget, ev ent)); 130 return m_widget->handleGestureEvent(PlatformGestureEventBuilder(m_widget, ev ent));
131 } 131 }
132 132
133 #if ENABLE(TOUCH_EVENTS)
133 bool WebPopupMenuImpl::handleTouchEvent(const WebTouchEvent& event) 134 bool WebPopupMenuImpl::handleTouchEvent(const WebTouchEvent& event)
134 { 135 {
135 136
136 PlatformTouchEventBuilder touchEventBuilder(m_widget, event); 137 PlatformTouchEventBuilder touchEventBuilder(m_widget, event);
137 bool defaultPrevented(m_widget->handleTouchEvent(touchEventBuilder)); 138 bool defaultPrevented(m_widget->handleTouchEvent(touchEventBuilder));
138 return defaultPrevented; 139 return defaultPrevented;
139 } 140 }
141 #endif
140 142
141 bool WebPopupMenuImpl::handleKeyEvent(const WebKeyboardEvent& event) 143 bool WebPopupMenuImpl::handleKeyEvent(const WebKeyboardEvent& event)
142 { 144 {
143 return m_widget->handleKeyEvent(PlatformKeyboardEventBuilder(event)); 145 return m_widget->handleKeyEvent(PlatformKeyboardEventBuilder(event));
144 } 146 }
145 147
146 // WebWidget ------------------------------------------------------------------- 148 // WebWidget -------------------------------------------------------------------
147 149
148 void WebPopupMenuImpl::close() 150 void WebPopupMenuImpl::close()
149 { 151 {
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 ASSERT(widget == m_widget); 402 ASSERT(widget == m_widget);
401 if (m_widget) { 403 if (m_widget) {
402 m_widget->setClient(0); 404 m_widget->setClient(0);
403 m_widget = 0; 405 m_widget = 0;
404 } 406 }
405 if (m_client) 407 if (m_client)
406 m_client->closeWidgetSoon(); 408 m_client->closeWidgetSoon();
407 } 409 }
408 410
409 } // namespace WebKit 411 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebPagePopupImpl.cpp ('k') | Source/WebKit/chromium/src/WebRuntimeFeatures.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698