| Index: content/renderer/gpu/frame_swap_message_queue.cc
|
| diff --git a/content/renderer/gpu/frame_swap_message_queue.cc b/content/renderer/gpu/frame_swap_message_queue.cc
|
| index e48daa8a11beb219e2c99e42201716446f38085e..bf91dd84e0f89bdb19c8cb50922547114c474da6 100644
|
| --- a/content/renderer/gpu/frame_swap_message_queue.cc
|
| +++ b/content/renderer/gpu/frame_swap_message_queue.cc
|
| @@ -36,7 +36,7 @@ namespace {
|
| class SendMessageScopeImpl : public FrameSwapMessageQueue::SendMessageScope {
|
| public:
|
| SendMessageScopeImpl(base::Lock* lock) : auto_lock_(*lock) {}
|
| - virtual ~SendMessageScopeImpl() override {}
|
| + ~SendMessageScopeImpl() override {}
|
|
|
| private:
|
| base::AutoLock auto_lock_;
|
| @@ -46,26 +46,26 @@ class VisualStateQueue : public FrameSwapMessageSubQueue {
|
| public:
|
| VisualStateQueue() {}
|
|
|
| - virtual ~VisualStateQueue() {
|
| + ~VisualStateQueue() override {
|
| for (VisualStateQueueMap::iterator i = queue_.begin(); i != queue_.end();
|
| i++) {
|
| STLDeleteElements(&i->second);
|
| }
|
| }
|
|
|
| - virtual bool Empty() const override { return queue_.empty(); }
|
| + bool Empty() const override { return queue_.empty(); }
|
|
|
| - virtual void QueueMessage(int source_frame_number,
|
| - scoped_ptr<IPC::Message> msg,
|
| - bool* is_first) override {
|
| + void QueueMessage(int source_frame_number,
|
| + scoped_ptr<IPC::Message> msg,
|
| + bool* is_first) override {
|
| if (is_first)
|
| *is_first = (queue_.count(source_frame_number) == 0);
|
|
|
| queue_[source_frame_number].push_back(msg.release());
|
| }
|
|
|
| - virtual void DrainMessages(int source_frame_number,
|
| - ScopedVector<IPC::Message>* messages) override {
|
| + void DrainMessages(int source_frame_number,
|
| + ScopedVector<IPC::Message>* messages) override {
|
| VisualStateQueueMap::iterator end = queue_.upper_bound(source_frame_number);
|
| for (VisualStateQueueMap::iterator i = queue_.begin(); i != end; i++) {
|
| DCHECK(i->first <= source_frame_number);
|
| @@ -86,18 +86,18 @@ class VisualStateQueue : public FrameSwapMessageSubQueue {
|
| class SwapQueue : public FrameSwapMessageSubQueue {
|
| public:
|
| SwapQueue() {}
|
| - virtual bool Empty() const override { return queue_.empty(); }
|
| + bool Empty() const override { return queue_.empty(); }
|
|
|
| - virtual void QueueMessage(int source_frame_number,
|
| - scoped_ptr<IPC::Message> msg,
|
| - bool* is_first) override {
|
| + void QueueMessage(int source_frame_number,
|
| + scoped_ptr<IPC::Message> msg,
|
| + bool* is_first) override {
|
| if (is_first)
|
| *is_first = Empty();
|
| queue_.push_back(msg.release());
|
| }
|
|
|
| - virtual void DrainMessages(int source_frame_number,
|
| - ScopedVector<IPC::Message>* messages) override {
|
| + void DrainMessages(int source_frame_number,
|
| + ScopedVector<IPC::Message>* messages) override {
|
| messages->insert(messages->end(), queue_.begin(), queue_.end());
|
| queue_.weak_clear();
|
| }
|
|
|