summaryrefslogtreecommitdiffstats
path: root/content/content_browser.gypi
diff options
context:
space:
mode:
authormohsen@chromium.org <mohsen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-23 16:16:42 +0000
committermohsen@chromium.org <mohsen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-23 16:16:42 +0000
commit045d4546939687125820bfd0a10bb8748a49b59f (patch)
tree7660ef19fe5fdbf928bf1b47fb3e7fdedc206eb9 /content/content_browser.gypi
parent3e61f775de5ec8a32d2c3b8b10fefe1073743ca4 (diff)
downloadchromium_src-045d4546939687125820bfd0a10bb8748a49b59f.zip
chromium_src-045d4546939687125820bfd0a10bb8748a49b59f.tar.gz
chromium_src-045d4546939687125820bfd0a10bb8748a49b59f.tar.bz2
Suppress touchscreen tap immediately after a GestureFlingCancel
Tapping on the touchscreen during a fling scroll causes a GestureFlingCancel to be sent to stop the fling. It also sends a pair of GestureTapDown/GestureTap events that should be suppressed if the fling is successfully stopped (otherwise we will have undesirable side effects; e.g. activating a link or push button in tap location). This was working for touchpad. It is now added for touchscreen, too. BUG=162242 Review URL: https://chromiumcodereview.appspot.com/12087140 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_browser.gypi')
-rw-r--r--content/content_browser.gypi10
1 files changed, 9 insertions, 1 deletions
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index e75ae99..482ce29 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -831,6 +831,9 @@
'browser/renderer_host/touchpad_tap_suppression_controller_aura.cc',
'browser/renderer_host/touchpad_tap_suppression_controller.cc',
'browser/renderer_host/touchpad_tap_suppression_controller.h',
+ 'browser/renderer_host/touchscreen_tap_suppression_controller.cc',
+ 'browser/renderer_host/touchscreen_tap_suppression_controller.h',
+ 'browser/renderer_host/touchscreen_tap_suppression_controller_stub.cc',
'browser/renderer_host/ui_events_helper.cc',
'browser/renderer_host/ui_events_helper.h',
'browser/renderer_host/web_input_event_aura.cc',
@@ -1207,6 +1210,12 @@
'sources!': [
'browser/renderer_host/ui_events_helper.cc',
'browser/renderer_host/ui_events_helper.h',
+ 'browser/renderer_host/tap_suppression_controller.cc',
+ 'browser/renderer_host/touchscreen_tap_suppression_controller.cc',
+ ],
+ }, {
+ 'sources!': [
+ 'browser/renderer_host/touchscreen_tap_suppression_controller_stub.cc',
],
}],
['use_aura==1', {
@@ -1243,7 +1252,6 @@
['exclude', '^browser/renderer_host/software_output_device_win.h'],
['exclude', '^browser/renderer_host/software_output_device_x11.cc'],
['exclude', '^browser/renderer_host/software_output_device_x11.h'],
- ['exclude', '^browser/renderer_host/tap_suppression_controller.cc'],
['exclude', '^browser/renderer_host/touchpad_tap_suppression_controller_aura.cc'],
],
}],