| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/renderer/gpu/frame_swap_message_queue.h" | 5 #include "content/renderer/gpu/frame_swap_message_queue.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "base/containers/hash_tables.h" | 9 #include "base/containers/hash_tables.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 | 176 |
| 177 swap_queue_->DrainMessages(0, messages); | 177 swap_queue_->DrainMessages(0, messages); |
| 178 messages->insert(messages->end(), | 178 messages->insert(messages->end(), |
| 179 next_drain_messages_.begin(), | 179 next_drain_messages_.begin(), |
| 180 next_drain_messages_.end()); | 180 next_drain_messages_.end()); |
| 181 next_drain_messages_.weak_clear(); | 181 next_drain_messages_.weak_clear(); |
| 182 } | 182 } |
| 183 | 183 |
| 184 scoped_ptr<FrameSwapMessageQueue::SendMessageScope> | 184 scoped_ptr<FrameSwapMessageQueue::SendMessageScope> |
| 185 FrameSwapMessageQueue::AcquireSendMessageScope() { | 185 FrameSwapMessageQueue::AcquireSendMessageScope() { |
| 186 return make_scoped_ptr(new SendMessageScopeImpl(&lock_)) | 186 return make_scoped_ptr(new SendMessageScopeImpl(&lock_)); |
| 187 .PassAs<SendMessageScope>(); | |
| 188 } | 187 } |
| 189 | 188 |
| 190 // static | 189 // static |
| 191 void FrameSwapMessageQueue::TransferMessages(ScopedVector<IPC::Message>& source, | 190 void FrameSwapMessageQueue::TransferMessages(ScopedVector<IPC::Message>& source, |
| 192 vector<IPC::Message>* dest) { | 191 vector<IPC::Message>* dest) { |
| 193 for (vector<IPC::Message*>::iterator i = source.begin(); i != source.end(); | 192 for (vector<IPC::Message*>::iterator i = source.begin(); i != source.end(); |
| 194 ++i) { | 193 ++i) { |
| 195 IPC::Message* m(*i); | 194 IPC::Message* m(*i); |
| 196 dest->push_back(*m); | 195 dest->push_back(*m); |
| 197 delete m; | 196 delete m; |
| 198 } | 197 } |
| 199 source.weak_clear(); | 198 source.weak_clear(); |
| 200 } | 199 } |
| 201 | 200 |
| 202 } // namespace content | 201 } // namespace content |
| OLD | NEW |