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

Unified Diff: content/browser/renderer_host/input/input_router_impl.cc

Issue 2435863004: Remove stl_util's deletion function use from content/. (Closed)
Patch Set: minus service worker Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/input/input_router_impl.cc
diff --git a/content/browser/renderer_host/input/input_router_impl.cc b/content/browser/renderer_host/input/input_router_impl.cc
index 83f66be026b71146e317df8347e9616fdafa4200..40fc18b75cde33de01445f7eb5bf5b9efa8c0893 100644
--- a/content/browser/renderer_host/input/input_router_impl.cc
+++ b/content/browser/renderer_host/input/input_router_impl.cc
@@ -98,7 +98,6 @@ InputRouterImpl::InputRouterImpl(IPC::Sender* sender,
}
InputRouterImpl::~InputRouterImpl() {
- STLDeleteElements(&pending_select_messages_);
}
bool InputRouterImpl::SendInput(std::unique_ptr<IPC::Message> message) {
@@ -319,11 +318,10 @@ bool InputRouterImpl::SendSelectMessage(std::unique_ptr<IPC::Message> message) {
if (select_message_pending_) {
if (!pending_select_messages_.empty() &&
pending_select_messages_.back()->type() == message->type()) {
- delete pending_select_messages_.back();
pending_select_messages_.pop_back();
}
- pending_select_messages_.push_back(message.release());
+ pending_select_messages_.push_back(std::move(message));
return true;
}
@@ -466,7 +464,7 @@ void InputRouterImpl::OnSelectMessageAck() {
select_message_pending_ = false;
if (!pending_select_messages_.empty()) {
std::unique_ptr<IPC::Message> next_message =
- base::WrapUnique(pending_select_messages_.front());
+ std::move(pending_select_messages_.front());
pending_select_messages_.pop_front();
SendSelectMessage(std::move(next_message));
« no previous file with comments | « content/browser/renderer_host/input/input_router_impl.h ('k') | content/browser/renderer_host/input/mouse_wheel_event_queue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698