| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_WEB_INPUT_EVENT_AURA_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_WEB_INPUT_EVENT_AURA_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_WEB_INPUT_EVENT_AURA_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_WEB_INPUT_EVENT_AURA_H_ |
| 7 | 7 |
| 8 #include "content/common/content_export.h" | 8 #include "content/common/content_export.h" |
| 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
| 10 | 10 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 CONTENT_EXPORT WebKit::WebGestureEvent MakeWebGestureEvent( | 32 CONTENT_EXPORT WebKit::WebGestureEvent MakeWebGestureEvent( |
| 33 ui::ScrollEvent* event); | 33 ui::ScrollEvent* event); |
| 34 CONTENT_EXPORT WebKit::WebGestureEvent MakeWebGestureEventFlingCancel(); | 34 CONTENT_EXPORT WebKit::WebGestureEvent MakeWebGestureEventFlingCancel(); |
| 35 | 35 |
| 36 // Updates the WebTouchEvent based on the TouchEvent. It returns the updated | 36 // Updates the WebTouchEvent based on the TouchEvent. It returns the updated |
| 37 // WebTouchPoint contained in the WebTouchEvent, or NULL if no point was | 37 // WebTouchPoint contained in the WebTouchEvent, or NULL if no point was |
| 38 // updated. | 38 // updated. |
| 39 WebKit::WebTouchPoint* UpdateWebTouchEvent(ui::TouchEvent* event, | 39 WebKit::WebTouchPoint* UpdateWebTouchEvent(ui::TouchEvent* event, |
| 40 WebKit::WebTouchEvent* web_event); | 40 WebKit::WebTouchEvent* web_event); |
| 41 | 41 |
| 42 } | 42 int EventFlagsToWebEventModifiers(int flags); |
| 43 |
| 44 } // namespace content |
| 43 | 45 |
| 44 #endif // CONTENT_BROWSER_RENDERER_HOST_WEB_INPUT_EVENT_AURA_H_ | 46 #endif // CONTENT_BROWSER_RENDERER_HOST_WEB_INPUT_EVENT_AURA_H_ |
| OLD | NEW |