summaryrefslogtreecommitdiffstats
path: root/chrome/browser/about_flags.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-28 15:44:51 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-28 15:44:51 +0000
commitc9199b28a67a556fb753147d89b27f93dbe55b01 (patch)
treed41107ea2d44ebdd009171c9f6fbd8151797b716 /chrome/browser/about_flags.cc
parent2270d0ef7183ab91fd211203bd4cc22279f95425 (diff)
downloadchromium_src-c9199b28a67a556fb753147d89b27f93dbe55b01.zip
chromium_src-c9199b28a67a556fb753147d89b27f93dbe55b01.tar.gz
chromium_src-c9199b28a67a556fb753147d89b27f93dbe55b01.tar.bz2
Revert 266470 "Implement async touchmove dispatch during scroll"
valgrind reports uninitialized memory usage: http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Tests%20%28valgrind%29%281%29/builds/33440/steps/memory%20test%3A%20content/logs/AD4CE3561F03B37F fun:_ZN7content15TouchEventQueue25SendTouchEventImmediatelyERKNS_20EventWithLatencyInfoIN5blink13WebTouchEventEEE fun:_ZN7content15TouchEventQueue26ForwardNextEventToRendererEv fun:_ZN7content15TouchEventQueue10QueueEventERKNS_20EventWithLatencyInfoIN5blink13WebTouchEventEEE fun:_ZN7content19TouchEventQueueTest14SendTouchEventERKN5blink13WebTouchEventE fun:_ZN7content19TouchEventQueueTest14SendTouchEventEv fun:_ZN7content19TouchEventQueueTest15PressTouchPointEff fun:_ZN7content30TouchEventQueueTest_Basic_Test8TestBodyEv http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Tests%20%28valgrind%29%281%29/builds/33440/steps/memory%20test%3A%20content/logs/383BD397F91FBC46 fun:_ZN7content15TouchEventQueue25SendTouchEventImmediatelyERKNS_20EventWithLatencyInfoIN5blink13WebTouchEventEEE fun:_ZN7content15TouchEventQueue19TouchTimeoutHandler17ConfirmTouchEventENS_18InputEventAckStateE fun:_ZN7content15TouchEventQueue15ProcessTouchAckENS_18InputEventAckStateERKN2ui11LatencyInfoE fun:_ZN7content19TouchEventQueueTest17SendTouchEventAckENS_18InputEventAckStateE fun:_ZN7content42TouchEventQueueTest_TouchTimeoutBasic_Test8TestBodyEv etc > Implement async touchmove dispatch during scroll > > This implements a touch dispatch model in which touchmove sending is throttled > while a scroll sequence is active and being consumed. Such touchmove's are > marked with |cancelable = false|, indicating to any potential consumers that the > event cannot be prevented from triggering a platform gesture. Throttling limits > the touchmove sending rate during scrolling to 1 event per 200ms. > > BUG=346693 > > Review URL: https://codereview.chromium.org/245833002 TBR=jdduke@chromium.org Review URL: https://codereview.chromium.org/252023005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266579 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/about_flags.cc')
-rw-r--r--chrome/browser/about_flags.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index ce930a0..26031bb 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -374,9 +374,9 @@ const Experiment::Choice kTouchScrollingModeChoices[] = {
{ IDS_FLAGS_TOUCH_SCROLLING_MODE_TOUCHCANCEL,
switches::kTouchScrollingMode,
switches::kTouchScrollingModeTouchcancel },
- { IDS_FLAGS_TOUCH_SCROLLING_MODE_ASYNC_TOUCHMOVE,
+ { IDS_FLAGS_TOUCH_SCROLLING_MODE_ABSORB_TOUCHMOVE,
switches::kTouchScrollingMode,
- switches::kTouchScrollingModeAsyncTouchmove },
+ switches::kTouchScrollingModeAbsorbTouchmove },
{ IDS_FLAGS_TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE,
switches::kTouchScrollingMode,
switches::kTouchScrollingModeSyncTouchmove },