Fix memory leak in ~GestureRecognizerImpl

ui/base/gestures/gesture_recognizer_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/gestures/gesture_recognizer_impl.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "ui/base/events.h"
@@ skipping 152 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // GestureRecognizerImpl, public:
 
 GestureRecognizerImpl::GestureRecognizerImpl(GestureEventHelper* helper)
     : helper_(helper) {
   gesture_consumer_ignorer_.reset(new GestureConsumerIgnorer());
 }
 
 GestureRecognizerImpl::~GestureRecognizerImpl() {
+  std::map<GestureConsumer*, GestureSequence*>::iterator i;
+  for (i = consumer_sequence_.begin(); i != consumer_sequence_.end(); ++i)

[sky, 2012/08/03 20:05:07]

Move iterators inside the for loop, that way you don't end up with i2. That
said, I believe STLDeleteValues does what you want (in base/stl_util.h).

[girard, 2012/08/03 20:14:45]

Nice!  I was hoping there might be a utility to take care of this.

[sadrul, 2012/08/03 20:16:42]

Nice! Thanks!

+    delete i->second;
+  std::map<GestureConsumer*, TouchEventQueue*>::iterator i2;
+  for (i2 = event_queue_.begin(); i2 != event_queue_.end(); ++i2)
+    delete i2->second;
 }
 
 // Checks if this finger is already down, if so, returns the current target.
 // Otherwise, returns NULL.
 GestureConsumer* GestureRecognizerImpl::GetTouchLockedTarget(
     TouchEvent* event) {
   return touch_id_target_[event->GetTouchId()];
 }
 
 GestureConsumer* GestureRecognizerImpl::GetTargetForGestureEvent(
@@ skipping 157 matching lines @@
   RemoveConsumerFromMap(consumer, &touch_id_target_);
   RemoveConsumerFromMap(consumer, &touch_id_target_for_gestures_);
 }
 
 // GestureRecognizer, static
 GestureRecognizer* GestureRecognizer::Create(GestureEventHelper* helper) {
   return new GestureRecognizerImpl(helper);
 }
 
 }  // namespace ui