summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-09 19:37:37 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-09 19:37:37 +0000
commit138c6ec7f5ddaccb176a50e0cc4fbcfbadb34e45 (patch)
treed6e22b8212b9e61cf034e4dc1ae994ddd8763fd0 /content
parent1e033489eba32dc824b3625a74d1c7f7521295dc (diff)
downloadchromium_src-138c6ec7f5ddaccb176a50e0cc4fbcfbadb34e45.zip
chromium_src-138c6ec7f5ddaccb176a50e0cc4fbcfbadb34e45.tar.gz
chromium_src-138c6ec7f5ddaccb176a50e0cc4fbcfbadb34e45.tar.bz2
Hook up the newly-added appropriate web-gesture events.
BUG=112348 TEST=none Review URL: https://chromiumcodereview.appspot.com/9372010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121268 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/web_input_event_aurax11.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/content/browser/renderer_host/web_input_event_aurax11.cc b/content/browser/renderer_host/web_input_event_aurax11.cc
index 5ce2999..1373f19 100644
--- a/content/browser/renderer_host/web_input_event_aurax11.cc
+++ b/content/browser/renderer_host/web_input_event_aurax11.cc
@@ -322,8 +322,13 @@ WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
gesture_event.type = WebKit::WebInputEvent::GestureScrollEnd;
break;
case ui::ET_GESTURE_PINCH_BEGIN:
+ gesture_event.type = WebKit::WebInputEvent::GesturePinchBegin;
+ break;
case ui::ET_GESTURE_PINCH_UPDATE:
+ gesture_event.type = WebKit::WebInputEvent::GesturePinchUpdate;
+ break;
case ui::ET_GESTURE_PINCH_END:
+ gesture_event.type = WebKit::WebInputEvent::GesturePinchEnd;
break;
default:
NOTREACHED() << "Unknown gesture type: " << event->type();