| Index: content/browser/renderer_host/web_input_event_aura.cc
|
| diff --git a/content/browser/renderer_host/web_input_event_aura.cc b/content/browser/renderer_host/web_input_event_aura.cc
|
| index 65fb48f3a7196589a70b527ddc916dc00ba60b37..d92fdca5b480e448e5a87d83deb853897474197a 100644
|
| --- a/content/browser/renderer_host/web_input_event_aura.cc
|
| +++ b/content/browser/renderer_host/web_input_event_aura.cc
|
| @@ -15,12 +15,16 @@ WebKit::WebMouseWheelEvent MakeUntranslatedWebMouseWheelEventFromNativeEvent(
|
| base::NativeEvent native_event);
|
| WebKit::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent(
|
| base::NativeEvent native_event);
|
| +WebKit::WebTouchPoint* UpdateWebTouchEventFromNativeEvent(
|
| + base::NativeEvent native_event, WebKit::WebTouchEvent* web_event);
|
| #else
|
| WebKit::WebMouseEvent MakeWebMouseEventFromAuraEvent(aura::MouseEvent* event);
|
| WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
|
| aura::MouseEvent* event);
|
| WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
|
| aura::KeyEvent* event);
|
| +WebKit::WebTouchPoint* UpdateWebTouchEventFromAuraEvent(
|
| + aura::TouchEvent* event, WebKit::WebTouchEvent* web_event);
|
| #endif
|
|
|
| // General approach:
|
| @@ -104,4 +108,13 @@ WebKit::WebKeyboardEvent MakeWebKeyboardEvent(aura::KeyEvent* event) {
|
| #endif
|
| }
|
|
|
| +WebKit::WebTouchPoint* UpdateWebTouchEvent(aura::TouchEvent* event,
|
| + WebKit::WebTouchEvent* web_event) {
|
| +#if defined(OS_WIN)
|
| + return UpdateWebTouchEventFromNativeEvent(event->native_event(), web_event);
|
| +#else
|
| + return UpdateWebTouchEventFromAuraEvent(event, web_event);
|
| +#endif
|
| +}
|
| +
|
| } // namespace content
|
|
|