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

Side by Side Diff: services/view_manager/gesture_manager.cc

Issue 1408793006: Convert "return local_var.Pass();" to "return local_var;". (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 1 month 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "services/view_manager/gesture_manager.h" 5 #include "services/view_manager/gesture_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "mojo/services/input_events/interfaces/input_events.mojom.h" 9 #include "mojo/services/input_events/interfaces/input_events.mojom.h"
10 #include "mojo/services/view_manager/cpp/keys.h" 10 #include "mojo/services/view_manager/cpp/keys.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 } 53 }
54 54
55 mojo::EventPtr CloneEventForView(const mojo::Event& event, 55 mojo::EventPtr CloneEventForView(const mojo::Event& event,
56 const ServerView* view) { 56 const ServerView* view) {
57 mojo::EventPtr result(event.Clone()); 57 mojo::EventPtr result(event.Clone());
58 const gfx::PointF location(event.pointer_data->x, event.pointer_data->y); 58 const gfx::PointF location(event.pointer_data->x, event.pointer_data->y);
59 const gfx::PointF target_location( 59 const gfx::PointF target_location(
60 ConvertPointFBetweenViews(view->GetRoot(), view, location)); 60 ConvertPointFBetweenViews(view->GetRoot(), view, location));
61 result->pointer_data->x = target_location.x(); 61 result->pointer_data->x = target_location.x();
62 result->pointer_data->y = target_location.y(); 62 result->pointer_data->y = target_location.y();
63 return result.Pass(); 63 return result;
64 } 64 }
65 65
66 } // namespace 66 } // namespace
67 67
68 // GestureStateChange ---------------------------------------------------------- 68 // GestureStateChange ----------------------------------------------------------
69 69
70 GestureStateChange::GestureStateChange() 70 GestureStateChange::GestureStateChange()
71 : chosen_gesture(GestureManager::kInvalidGestureId) { 71 : chosen_gesture(GestureManager::kInvalidGestureId) {
72 } 72 }
73 73
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 void GestureManager::ScheduleDelete(Pointer* pointer) { 692 void GestureManager::ScheduleDelete(Pointer* pointer) {
693 auto iter = 693 auto iter =
694 std::find(active_pointers_.begin(), active_pointers_.end(), pointer); 694 std::find(active_pointers_.begin(), active_pointers_.end(), pointer);
695 if (iter != active_pointers_.end()) { 695 if (iter != active_pointers_.end()) {
696 active_pointers_.weak_erase(iter); 696 active_pointers_.weak_erase(iter);
697 pointers_to_delete_.push_back(pointer); 697 pointers_to_delete_.push_back(pointer);
698 } 698 }
699 } 699 }
700 700
701 } // namespace view_manager 701 } // namespace view_manager
OLDNEW
« no previous file with comments | « services/view_manager/animation_runner_unittest.cc ('k') | services/view_manager/gesture_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698