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

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

Issue 14296003: Remove TOUCH_EVENTS and TOUCH_EVENT_TRACKING compile-time flags. (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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 case WebInputEvent::GestureFlingCancel: 151 case WebInputEvent::GestureFlingCancel:
152 case WebInputEvent::GestureTap: 152 case WebInputEvent::GestureTap:
153 case WebInputEvent::GestureTapDown: 153 case WebInputEvent::GestureTapDown:
154 case WebInputEvent::GestureTapCancel: 154 case WebInputEvent::GestureTapCancel:
155 case WebInputEvent::GestureDoubleTap: 155 case WebInputEvent::GestureDoubleTap:
156 case WebInputEvent::GestureTwoFingerTap: 156 case WebInputEvent::GestureTwoFingerTap:
157 case WebInputEvent::GestureLongPress: 157 case WebInputEvent::GestureLongPress:
158 case WebInputEvent::GestureLongTap: 158 case WebInputEvent::GestureLongTap:
159 return handler.handleGestureEvent(*static_cast<const WebGestureEvent*>(& event)); 159 return handler.handleGestureEvent(*static_cast<const WebGestureEvent*>(& event));
160 160
161 #if ENABLE(TOUCH_EVENTS)
162 case WebInputEvent::TouchStart: 161 case WebInputEvent::TouchStart:
163 case WebInputEvent::TouchMove: 162 case WebInputEvent::TouchMove:
164 case WebInputEvent::TouchEnd: 163 case WebInputEvent::TouchEnd:
165 case WebInputEvent::TouchCancel: 164 case WebInputEvent::TouchCancel:
166 if (!frame || !frame->view()) 165 if (!frame || !frame->view())
167 return false; 166 return false;
168 return handler.handleTouchEvent(*frame, *static_cast<const WebTouchEvent *>(&event)); 167 return handler.handleTouchEvent(*frame, *static_cast<const WebTouchEvent *>(&event));
169 #endif
170 168
171 case WebInputEvent::GesturePinchBegin: 169 case WebInputEvent::GesturePinchBegin:
172 case WebInputEvent::GesturePinchEnd: 170 case WebInputEvent::GesturePinchEnd:
173 case WebInputEvent::GesturePinchUpdate: 171 case WebInputEvent::GesturePinchUpdate:
174 // FIXME: Once PlatformGestureEvent is updated to support pinch, this 172 // FIXME: Once PlatformGestureEvent is updated to support pinch, this
175 // should call handleGestureEvent, just like it currently does for 173 // should call handleGestureEvent, just like it currently does for
176 // gesture scroll. 174 // gesture scroll.
177 return false; 175 return false;
178 176
179 default: 177 default:
(...skipping 25 matching lines...) Expand all
205 void PageWidgetEventHandler::handleMouseUp(Frame& mainFrame, const WebMouseEvent & event) 203 void PageWidgetEventHandler::handleMouseUp(Frame& mainFrame, const WebMouseEvent & event)
206 { 204 {
207 mainFrame.eventHandler()->handleMouseReleaseEvent(PlatformMouseEventBuilder( mainFrame.view(), event)); 205 mainFrame.eventHandler()->handleMouseReleaseEvent(PlatformMouseEventBuilder( mainFrame.view(), event));
208 } 206 }
209 207
210 bool PageWidgetEventHandler::handleMouseWheel(Frame& mainFrame, const WebMouseWh eelEvent& event) 208 bool PageWidgetEventHandler::handleMouseWheel(Frame& mainFrame, const WebMouseWh eelEvent& event)
211 { 209 {
212 return mainFrame.eventHandler()->handleWheelEvent(PlatformWheelEventBuilder( mainFrame.view(), event)); 210 return mainFrame.eventHandler()->handleWheelEvent(PlatformWheelEventBuilder( mainFrame.view(), event));
213 } 211 }
214 212
215 #if ENABLE(TOUCH_EVENTS)
216 bool PageWidgetEventHandler::handleTouchEvent(Frame& mainFrame, const WebTouchEv ent& event) 213 bool PageWidgetEventHandler::handleTouchEvent(Frame& mainFrame, const WebTouchEv ent& event)
217 { 214 {
218 return mainFrame.eventHandler()->handleTouchEvent(PlatformTouchEventBuilder( mainFrame.view(), event)); 215 return mainFrame.eventHandler()->handleTouchEvent(PlatformTouchEventBuilder( mainFrame.view(), event));
219 } 216 }
220 #endif
221 217
222 } 218 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698