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

Side by Side Diff: ui/events/event_source.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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 | « ui/events/event_rewriter_unittest.cc ('k') | ui/events/event_target.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/events/event_source.h" 5 #include "ui/events/event_source.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ui/events/event_processor.h" 9 #include "ui/events/event_processor.h"
10 #include "ui/events/event_rewriter.h" 10 #include "ui/events/event_rewriter.h"
(...skipping 12 matching lines...) Expand all
23 } 23 }
24 24
25 void EventSource::RemoveEventRewriter(EventRewriter* rewriter) { 25 void EventSource::RemoveEventRewriter(EventRewriter* rewriter) {
26 EventRewriterList::iterator find = 26 EventRewriterList::iterator find =
27 std::find(rewriter_list_.begin(), rewriter_list_.end(), rewriter); 27 std::find(rewriter_list_.begin(), rewriter_list_.end(), rewriter);
28 if (find != rewriter_list_.end()) 28 if (find != rewriter_list_.end())
29 rewriter_list_.erase(find); 29 rewriter_list_.erase(find);
30 } 30 }
31 31
32 EventDispatchDetails EventSource::SendEventToProcessor(Event* event) { 32 EventDispatchDetails EventSource::SendEventToProcessor(Event* event) {
33 scoped_ptr<Event> rewritten_event; 33 std::unique_ptr<Event> rewritten_event;
34 EventRewriteStatus status = EVENT_REWRITE_CONTINUE; 34 EventRewriteStatus status = EVENT_REWRITE_CONTINUE;
35 EventRewriterList::const_iterator it = rewriter_list_.begin(), 35 EventRewriterList::const_iterator it = rewriter_list_.begin(),
36 end = rewriter_list_.end(); 36 end = rewriter_list_.end();
37 for (; it != end; ++it) { 37 for (; it != end; ++it) {
38 status = (*it)->RewriteEvent(*event, &rewritten_event); 38 status = (*it)->RewriteEvent(*event, &rewritten_event);
39 if (status == EVENT_REWRITE_DISCARD) { 39 if (status == EVENT_REWRITE_DISCARD) {
40 CHECK(!rewritten_event); 40 CHECK(!rewritten_event);
41 return EventDispatchDetails(); 41 return EventDispatchDetails();
42 } 42 }
43 if (status == EVENT_REWRITE_CONTINUE) { 43 if (status == EVENT_REWRITE_CONTINUE) {
44 CHECK(!rewritten_event); 44 CHECK(!rewritten_event);
45 continue; 45 continue;
46 } 46 }
47 break; 47 break;
48 } 48 }
49 CHECK((it == end && !rewritten_event) || rewritten_event); 49 CHECK((it == end && !rewritten_event) || rewritten_event);
50 EventDispatchDetails details = 50 EventDispatchDetails details =
51 DeliverEventToProcessor(rewritten_event ? rewritten_event.get() : event); 51 DeliverEventToProcessor(rewritten_event ? rewritten_event.get() : event);
52 if (details.dispatcher_destroyed) 52 if (details.dispatcher_destroyed)
53 return details; 53 return details;
54 54
55 while (status == EVENT_REWRITE_DISPATCH_ANOTHER) { 55 while (status == EVENT_REWRITE_DISPATCH_ANOTHER) {
56 scoped_ptr<Event> new_event; 56 std::unique_ptr<Event> new_event;
57 status = (*it)->NextDispatchEvent(*rewritten_event, &new_event); 57 status = (*it)->NextDispatchEvent(*rewritten_event, &new_event);
58 if (status == EVENT_REWRITE_DISCARD) 58 if (status == EVENT_REWRITE_DISCARD)
59 return EventDispatchDetails(); 59 return EventDispatchDetails();
60 CHECK_NE(EVENT_REWRITE_CONTINUE, status); 60 CHECK_NE(EVENT_REWRITE_CONTINUE, status);
61 CHECK(new_event); 61 CHECK(new_event);
62 details = DeliverEventToProcessor(new_event.get()); 62 details = DeliverEventToProcessor(new_event.get());
63 if (details.dispatcher_destroyed) 63 if (details.dispatcher_destroyed)
64 return details; 64 return details;
65 rewritten_event.reset(new_event.release()); 65 rewritten_event.reset(new_event.release());
66 } 66 }
67 return EventDispatchDetails(); 67 return EventDispatchDetails();
68 } 68 }
69 69
70 EventDispatchDetails EventSource::DeliverEventToProcessor(Event* event) { 70 EventDispatchDetails EventSource::DeliverEventToProcessor(Event* event) {
71 EventProcessor* processor = GetEventProcessor(); 71 EventProcessor* processor = GetEventProcessor();
72 CHECK(processor); 72 CHECK(processor);
73 return processor->OnEventFromSource(event); 73 return processor->OnEventFromSource(event);
74 } 74 }
75 75
76 } // namespace ui 76 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/event_rewriter_unittest.cc ('k') | ui/events/event_target.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698