summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-24 00:13:19 +0000
committertdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-24 00:13:19 +0000
commit95df669998c51ae13854744e8fc75eec213c482e (patch)
tree30c8b50eb70321a738ef36bd1d30e643c01c184a
parente56514044f536aeacbbf5d2b0a5dc4a89c2f4393 (diff)
downloadchromium_src-95df669998c51ae13854744e8fc75eec213c482e.zip
chromium_src-95df669998c51ae13854744e8fc75eec213c482e.tar.gz
chromium_src-95df669998c51ae13854744e8fc75eec213c482e.tar.bz2
Correctly initialize max_distance_from_start_square_
BUG=337462 Review URL: https://codereview.chromium.org/145823002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246739 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ash/touch/touch_uma.cc4
-rw-r--r--tools/valgrind/memcheck/suppressions.txt8
2 files changed, 4 insertions, 8 deletions
diff --git a/ash/touch/touch_uma.cc b/ash/touch/touch_uma.cc
index 1f6c8fb..9d7aeed 100644
--- a/ash/touch/touch_uma.cc
+++ b/ash/touch/touch_uma.cc
@@ -64,6 +64,10 @@ enum UMAEventType {
};
struct WindowTouchDetails {
+ WindowTouchDetails()
+ : max_distance_from_start_squared_(0) {
+ }
+
// Move and start times of the touch points. The key is the touch-id.
std::map<int, base::TimeDelta> last_move_time_;
std::map<int, base::TimeDelta> last_start_time_;
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 0d00d81..91f02af 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -6389,11 +6389,3 @@
fun:_ZN7content12_GLOBAL__N_123CreateWebFrameTestProxyEPNS_14RenderViewImplEi
fun:_ZN7content15RenderFrameImpl6CreateEPNS_14RenderViewImplEi
}
-{
- bug_337462
- Memcheck:Uninitialized
- fun:_ZN3ash8TouchUMA16RecordTouchEventEPN4aura6WindowERKN2ui10TouchEventE
- fun:_ZN3ash8internal24SystemGestureEventFilter12OnTouchEventEPN2ui10TouchEventE
- fun:_ZN2ui12EventHandler7OnEventEPNS_5EventE
-}
-