Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1687)

Side by Side Diff: ui/base/gestures/gesture_recognizer_impl.cc

Issue 10826117: Fix memory leak in ~GestureRecognizerImpl (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Revised as per sky's review. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/gestures/gesture_recognizer_impl.h" 5 #include "ui/base/gestures/gesture_recognizer_impl.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "ui/base/events.h" 10 #include "ui/base/events.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 163
164 //////////////////////////////////////////////////////////////////////////////// 164 ////////////////////////////////////////////////////////////////////////////////
165 // GestureRecognizerImpl, public: 165 // GestureRecognizerImpl, public:
166 166
167 GestureRecognizerImpl::GestureRecognizerImpl(GestureEventHelper* helper) 167 GestureRecognizerImpl::GestureRecognizerImpl(GestureEventHelper* helper)
168 : helper_(helper) { 168 : helper_(helper) {
169 gesture_consumer_ignorer_.reset(new GestureConsumerIgnorer()); 169 gesture_consumer_ignorer_.reset(new GestureConsumerIgnorer());
170 } 170 }
171 171
172 GestureRecognizerImpl::~GestureRecognizerImpl() { 172 GestureRecognizerImpl::~GestureRecognizerImpl() {
173 STLDeleteValues(&consumer_sequence_);
174 STLDeleteValues(&event_queue_);
173 } 175 }
174 176
175 // Checks if this finger is already down, if so, returns the current target. 177 // Checks if this finger is already down, if so, returns the current target.
176 // Otherwise, returns NULL. 178 // Otherwise, returns NULL.
177 GestureConsumer* GestureRecognizerImpl::GetTouchLockedTarget( 179 GestureConsumer* GestureRecognizerImpl::GetTouchLockedTarget(
178 TouchEvent* event) { 180 TouchEvent* event) {
179 return touch_id_target_[event->GetTouchId()]; 181 return touch_id_target_[event->GetTouchId()];
180 } 182 }
181 183
182 GestureConsumer* GestureRecognizerImpl::GetTargetForGestureEvent( 184 GestureConsumer* GestureRecognizerImpl::GetTargetForGestureEvent(
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 RemoveConsumerFromMap(consumer, &touch_id_target_); 342 RemoveConsumerFromMap(consumer, &touch_id_target_);
341 RemoveConsumerFromMap(consumer, &touch_id_target_for_gestures_); 343 RemoveConsumerFromMap(consumer, &touch_id_target_for_gestures_);
342 } 344 }
343 345
344 // GestureRecognizer, static 346 // GestureRecognizer, static
345 GestureRecognizer* GestureRecognizer::Create(GestureEventHelper* helper) { 347 GestureRecognizer* GestureRecognizer::Create(GestureEventHelper* helper) {
346 return new GestureRecognizerImpl(helper); 348 return new GestureRecognizerImpl(helper);
347 } 349 }
348 350
349 } // namespace ui 351 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698