Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / renderer / gpu / frame_swap_message_queue.cc

diff --git a/src/content/renderer/gpu/frame_swap_message_queue.cc b/src/content/renderer/gpu/frame_swap_message_queue.cc
index df4185d..bf91dd8 100644 (file)
--- a/src/content/renderer/gpu/frame_swap_message_queue.cc
+++ b/src/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();
   }
@@ -183,8 +183,7 @@ void FrameSwapMessageQueue::DrainMessages(
 
 scoped_ptr<FrameSwapMessageQueue::SendMessageScope>
 FrameSwapMessageQueue::AcquireSendMessageScope() {
-  return make_scoped_ptr(new SendMessageScopeImpl(&lock_))
-      .PassAs<SendMessageScope>();
+  return make_scoped_ptr(new SendMessageScopeImpl(&lock_));
 }
 
 // static