| 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 df4185db1391778b799ba746e6473e5438f8b825..979f250f49d5a4787351c5ce332224e6bc99f854 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 {}
|
| + virtual ~SendMessageScopeImpl() override {}
|
|
|
| private:
|
| base::AutoLock auto_lock_;
|
| @@ -53,11 +53,11 @@ class VisualStateQueue : public FrameSwapMessageSubQueue {
|
| }
|
| }
|
|
|
| - virtual bool Empty() const OVERRIDE { return queue_.empty(); }
|
| + virtual bool Empty() const override { return queue_.empty(); }
|
|
|
| virtual void QueueMessage(int source_frame_number,
|
| scoped_ptr<IPC::Message> msg,
|
| - bool* is_first) OVERRIDE {
|
| + bool* is_first) override {
|
| if (is_first)
|
| *is_first = (queue_.count(source_frame_number) == 0);
|
|
|
| @@ -65,7 +65,7 @@ class VisualStateQueue : public FrameSwapMessageSubQueue {
|
| }
|
|
|
| virtual void DrainMessages(int source_frame_number,
|
| - ScopedVector<IPC::Message>* messages) OVERRIDE {
|
| + 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(); }
|
| + virtual bool Empty() const override { return queue_.empty(); }
|
|
|
| virtual void QueueMessage(int source_frame_number,
|
| scoped_ptr<IPC::Message> msg,
|
| - bool* is_first) OVERRIDE {
|
| + 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 {
|
| + ScopedVector<IPC::Message>* messages) override {
|
| messages->insert(messages->end(), queue_.begin(), queue_.end());
|
| queue_.weak_clear();
|
| }
|
|
|