content/browser/renderer_host/web_input_event_aura.cc - Issue 10831240: Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/web_input_event_aura.cc

Issue 10831240: Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge-tot Created 8 years, 4 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:

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 7054d91769f080cca8a744d7d02daceec1d15562..3395c47f2c4b74ec399cacd5c886e3738b846caa 100644

--- a/content/browser/renderer_host/web_input_event_aura.cc

+++ b/content/browser/renderer_host/web_input_event_aura.cc

@@ -33,7 +33,7 @@ WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(

WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(

ui::ScrollEvent* event);

WebKit::WebTouchPoint* UpdateWebTouchEventFromAuraEvent(

- ui::TouchEventImpl* event, WebKit::WebTouchEvent* web_event);

+ ui::TouchEvent* event, WebKit::WebTouchEvent* web_event);

#endif

// General approach:

@@ -184,7 +184,7 @@ WebKit::WebGestureEvent MakeWebGestureEventFlingCancel() {

return gesture_event;

}

-WebKit::WebTouchPoint* UpdateWebTouchEvent(ui::TouchEventImpl* event,

+WebKit::WebTouchPoint* UpdateWebTouchEvent(ui::TouchEvent* event,

WebKit::WebTouchEvent* web_event) {

#if defined(OS_WIN)

return UpdateWebTouchEventFromNativeEvent(event->native_event(), web_event);