| 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 18 matching lines...) Expand all Loading... |
| 29 private: | 29 private: |
| 30 DISALLOW_COPY_AND_ASSIGN(FrameSwapMessageSubQueue); | 30 DISALLOW_COPY_AND_ASSIGN(FrameSwapMessageSubQueue); |
| 31 }; | 31 }; |
| 32 | 32 |
| 33 namespace { | 33 namespace { |
| 34 | 34 |
| 35 // Queue specific to MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE. | 35 // Queue specific to MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE. |
| 36 class SendMessageScopeImpl : public FrameSwapMessageQueue::SendMessageScope { | 36 class SendMessageScopeImpl : public FrameSwapMessageQueue::SendMessageScope { |
| 37 public: | 37 public: |
| 38 SendMessageScopeImpl(base::Lock* lock) : auto_lock_(*lock) {} | 38 SendMessageScopeImpl(base::Lock* lock) : auto_lock_(*lock) {} |
| 39 virtual ~SendMessageScopeImpl() OVERRIDE {} | 39 virtual ~SendMessageScopeImpl() override {} |
| 40 | 40 |
| 41 private: | 41 private: |
| 42 base::AutoLock auto_lock_; | 42 base::AutoLock auto_lock_; |
| 43 }; | 43 }; |
| 44 | 44 |
| 45 class VisualStateQueue : public FrameSwapMessageSubQueue { | 45 class VisualStateQueue : public FrameSwapMessageSubQueue { |
| 46 public: | 46 public: |
| 47 VisualStateQueue() {} | 47 VisualStateQueue() {} |
| 48 | 48 |
| 49 virtual ~VisualStateQueue() { | 49 virtual ~VisualStateQueue() { |
| 50 for (VisualStateQueueMap::iterator i = queue_.begin(); i != queue_.end(); | 50 for (VisualStateQueueMap::iterator i = queue_.begin(); i != queue_.end(); |
| 51 i++) { | 51 i++) { |
| 52 STLDeleteElements(&i->second); | 52 STLDeleteElements(&i->second); |
| 53 } | 53 } |
| 54 } | 54 } |
| 55 | 55 |
| 56 virtual bool Empty() const OVERRIDE { return queue_.empty(); } | 56 virtual bool Empty() const override { return queue_.empty(); } |
| 57 | 57 |
| 58 virtual void QueueMessage(int source_frame_number, | 58 virtual void QueueMessage(int source_frame_number, |
| 59 scoped_ptr<IPC::Message> msg, | 59 scoped_ptr<IPC::Message> msg, |
| 60 bool* is_first) OVERRIDE { | 60 bool* is_first) override { |
| 61 if (is_first) | 61 if (is_first) |
| 62 *is_first = (queue_.count(source_frame_number) == 0); | 62 *is_first = (queue_.count(source_frame_number) == 0); |
| 63 | 63 |
| 64 queue_[source_frame_number].push_back(msg.release()); | 64 queue_[source_frame_number].push_back(msg.release()); |
| 65 } | 65 } |
| 66 | 66 |
| 67 virtual void DrainMessages(int source_frame_number, | 67 virtual void DrainMessages(int source_frame_number, |
| 68 ScopedVector<IPC::Message>* messages) OVERRIDE { | 68 ScopedVector<IPC::Message>* messages) override { |
| 69 VisualStateQueueMap::iterator end = queue_.upper_bound(source_frame_number); | 69 VisualStateQueueMap::iterator end = queue_.upper_bound(source_frame_number); |
| 70 for (VisualStateQueueMap::iterator i = queue_.begin(); i != end; i++) { | 70 for (VisualStateQueueMap::iterator i = queue_.begin(); i != end; i++) { |
| 71 DCHECK(i->first <= source_frame_number); | 71 DCHECK(i->first <= source_frame_number); |
| 72 messages->insert(messages->end(), i->second.begin(), i->second.end()); | 72 messages->insert(messages->end(), i->second.begin(), i->second.end()); |
| 73 i->second.clear(); | 73 i->second.clear(); |
| 74 } | 74 } |
| 75 queue_.erase(queue_.begin(), end); | 75 queue_.erase(queue_.begin(), end); |
| 76 } | 76 } |
| 77 | 77 |
| 78 private: | 78 private: |
| 79 typedef std::map<int, std::vector<IPC::Message*> > VisualStateQueueMap; | 79 typedef std::map<int, std::vector<IPC::Message*> > VisualStateQueueMap; |
| 80 VisualStateQueueMap queue_; | 80 VisualStateQueueMap queue_; |
| 81 | 81 |
| 82 DISALLOW_COPY_AND_ASSIGN(VisualStateQueue); | 82 DISALLOW_COPY_AND_ASSIGN(VisualStateQueue); |
| 83 }; | 83 }; |
| 84 | 84 |
| 85 // Queue specific to MESSAGE_DELIVERY_POLICY_WITH_NEXT_SWAP. | 85 // Queue specific to MESSAGE_DELIVERY_POLICY_WITH_NEXT_SWAP. |
| 86 class SwapQueue : public FrameSwapMessageSubQueue { | 86 class SwapQueue : public FrameSwapMessageSubQueue { |
| 87 public: | 87 public: |
| 88 SwapQueue() {} | 88 SwapQueue() {} |
| 89 virtual bool Empty() const OVERRIDE { return queue_.empty(); } | 89 virtual bool Empty() const override { return queue_.empty(); } |
| 90 | 90 |
| 91 virtual void QueueMessage(int source_frame_number, | 91 virtual void QueueMessage(int source_frame_number, |
| 92 scoped_ptr<IPC::Message> msg, | 92 scoped_ptr<IPC::Message> msg, |
| 93 bool* is_first) OVERRIDE { | 93 bool* is_first) override { |
| 94 if (is_first) | 94 if (is_first) |
| 95 *is_first = Empty(); | 95 *is_first = Empty(); |
| 96 queue_.push_back(msg.release()); | 96 queue_.push_back(msg.release()); |
| 97 } | 97 } |
| 98 | 98 |
| 99 virtual void DrainMessages(int source_frame_number, | 99 virtual void DrainMessages(int source_frame_number, |
| 100 ScopedVector<IPC::Message>* messages) OVERRIDE { | 100 ScopedVector<IPC::Message>* messages) override { |
| 101 messages->insert(messages->end(), queue_.begin(), queue_.end()); | 101 messages->insert(messages->end(), queue_.begin(), queue_.end()); |
| 102 queue_.weak_clear(); | 102 queue_.weak_clear(); |
| 103 } | 103 } |
| 104 | 104 |
| 105 private: | 105 private: |
| 106 ScopedVector<IPC::Message> queue_; | 106 ScopedVector<IPC::Message> queue_; |
| 107 | 107 |
| 108 DISALLOW_COPY_AND_ASSIGN(SwapQueue); | 108 DISALLOW_COPY_AND_ASSIGN(SwapQueue); |
| 109 }; | 109 }; |
| 110 | 110 |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 for (vector<IPC::Message*>::iterator i = source.begin(); i != source.end(); | 193 for (vector<IPC::Message*>::iterator i = source.begin(); i != source.end(); |
| 194 ++i) { | 194 ++i) { |
| 195 IPC::Message* m(*i); | 195 IPC::Message* m(*i); |
| 196 dest->push_back(*m); | 196 dest->push_back(*m); |
| 197 delete m; | 197 delete m; |
| 198 } | 198 } |
| 199 source.weak_clear(); | 199 source.weak_clear(); |
| 200 } | 200 } |
| 201 | 201 |
| 202 } // namespace content | 202 } // namespace content |
| OLD | NEW |