Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/async_pixel_transfer_manager_share_group.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/single_thread_task_runner.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_synthetic_delay.h"
 #include "gpu/command_buffer/service/async_pixel_transfer_delegate.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
@@ skipping 14 matching lines @@
   observer->DidComplete(mem_params);
 }
 
 // TODO(backer): Factor out common thread scheduling logic from the EGL and
 // ShareGroup implementations. http://crbug.com/239889
 class TransferThread : public base::Thread {
  public:
   TransferThread()
       : base::Thread(kAsyncTransferThreadName),
         initialized_(false) {
+    base::Thread::Options options;
     Start();
 #if defined(OS_ANDROID) || defined(OS_LINUX)
-    SetPriority(base::ThreadPriority::BACKGROUND);
+    options.priority = base::ThreadPriority::BACKGROUND;
 #endif
+    StartWithOptions(options);
   }
 
   ~TransferThread() override {
     // The only instance of this class was declared leaky.
     NOTREACHED();
   }
 
   void InitializeOnMainThread(gfx::GLContext* parent_context) {
     TRACE_EVENT0("gpu", "TransferThread::InitializeOnMainThread");
     if (initialized_)
       return;
 
     base::WaitableEvent wait_for_init(true, false);
-    message_loop_proxy()->PostTask(
-      FROM_HERE,
-      base::Bind(&TransferThread::InitializeOnTransferThread,
-                 base::Unretained(this),
-                 base::Unretained(parent_context),
-                 &wait_for_init));
+    task_runner()->PostTask(
+        FROM_HERE,
+        base::Bind(&TransferThread::InitializeOnTransferThread,
+                   base::Unretained(this), base::Unretained(parent_context),
+                   &wait_for_init));
     wait_for_init.Wait();
   }
 
   void CleanUp() override {
     surface_ = NULL;
     context_ = NULL;
   }
 
  private:
   bool initialized_;
@@ skipping 36 matching lines @@
     initialized_ = true;
     caller_wait->Signal();
   }
 
   DISALLOW_COPY_AND_ASSIGN(TransferThread);
 };
 
 base::LazyInstance<TransferThread>::Leaky
     g_transfer_thread = LAZY_INSTANCE_INITIALIZER;
 
-base::MessageLoopProxy* transfer_message_loop_proxy() {
-  return g_transfer_thread.Pointer()->message_loop_proxy().get();
+base::SingleThreadTaskRunner* transfer_task_runner() {
+  return g_transfer_thread.Pointer()->task_runner().get();
 }
 
 class PendingTask : public base::RefCountedThreadSafe<PendingTask> {
  public:
   explicit PendingTask(const base::Closure& task)
       : task_(task), task_pending_(true, false) {}
 
   bool TryRun() {
     // This is meant to be called on the main thread where the texture
     // is already bound.
@@ skipping 101 matching lines @@
       const AsyncMemoryParams mem_params,
       scoped_refptr<AsyncPixelTransferUploadStats> texture_upload_stats,
       const base::Closure& bind_callback) {
     TRACE_EVENT_SYNTHETIC_DELAY_BEGIN("gpu.AsyncTexImage");
     pending_upload_task_ = new PendingTask(base::Bind(
         &TransferStateInternal::PerformAsyncTexImage2D,
         this,
         tex_params,
         mem_params,
         texture_upload_stats));
-    transfer_message_loop_proxy()->PostTask(
-        FROM_HERE,
-        base::Bind(
-            &PendingTask::BindAndRun, pending_upload_task_, texture_id_));
+    transfer_task_runner()->PostTask(
+        FROM_HERE, base::Bind(&PendingTask::BindAndRun, pending_upload_task_,
+                              texture_id_));
 
     // Save the late bind callback, so we can notify the client when it is
     // bound.
     bind_callback_ = bind_callback;
   }
 
   void ScheduleAsyncTexSubImage2D(
       AsyncTexSubImage2DParams tex_params,
       AsyncMemoryParams mem_params,
       scoped_refptr<AsyncPixelTransferUploadStats> texture_upload_stats) {
     TRACE_EVENT_SYNTHETIC_DELAY_BEGIN("gpu.AsyncTexImage");
     pending_upload_task_ = new PendingTask(base::Bind(
         &TransferStateInternal::PerformAsyncTexSubImage2D,
         this,
         tex_params,
         mem_params,
         texture_upload_stats));
-    transfer_message_loop_proxy()->PostTask(
-        FROM_HERE,
-        base::Bind(
-            &PendingTask::BindAndRun, pending_upload_task_, texture_id_));
+    transfer_task_runner()->PostTask(
+        FROM_HERE, base::Bind(&PendingTask::BindAndRun, pending_upload_task_,
+                              texture_id_));
   }
 
  private:
   friend class base::RefCountedThreadSafe<TransferStateInternal>;
 
   virtual ~TransferStateInternal() {
   }
 
   void PerformAsyncTexImage2D(
       AsyncTexImage2DParams tex_params,
@@ skipping 214 matching lines @@
 
     shared_state_.pending_allocations.pop_front();
   }
 }
 
 void AsyncPixelTransferManagerShareGroup::AsyncNotifyCompletion(
     const AsyncMemoryParams& mem_params,
     AsyncPixelTransferCompletionObserver* observer) {
   // Post a PerformNotifyCompletion task to the upload thread. This task
   // will run after all async transfers are complete.
-  transfer_message_loop_proxy()->PostTask(
-      FROM_HERE,
-      base::Bind(&PerformNotifyCompletion,
-                 mem_params,
-                 make_scoped_refptr(observer)));
+  transfer_task_runner()->PostTask(
+      FROM_HERE, base::Bind(&PerformNotifyCompletion, mem_params,
+                            make_scoped_refptr(observer)));
 }
 
 uint32 AsyncPixelTransferManagerShareGroup::GetTextureUploadCount() {
   return shared_state_.texture_upload_stats->GetStats(NULL);
 }
 
 base::TimeDelta
 AsyncPixelTransferManagerShareGroup::GetTotalTextureUploadTime() {
   base::TimeDelta total_texture_upload_time;
   shared_state_.texture_upload_stats->GetStats(&total_texture_upload_time);
@@ skipping 19 matching lines @@
 
 AsyncPixelTransferDelegate*
 AsyncPixelTransferManagerShareGroup::CreatePixelTransferDelegateImpl(
     gles2::TextureRef* ref,
     const AsyncTexImage2DParams& define_params) {
   return new AsyncPixelTransferDelegateShareGroup(
       &shared_state_, ref->service_id(), define_params);
 }
 
 }  // namespace gpu