Removed cc::CompositorFrameSink::client_thread_checker_

RendererCompositorFrameSink holds its own thread checker similar to what
WindowCompositorFrameSink and DirectCompositorFrameSink do. This way,
cc::CompositorFrameSink::client_thread_check_ is no longer needed and we have
one less field in the API class.

BUG=673543
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel

Review-Url: https://codereview.chromium.org/2669213004
Cr-Commit-Position: refs/heads/master@{#447941}

cc/output/compositor_frame_sink.cc

@@ -27,7 +27,6 @@ CompositorFrameSink::CompositorFrameSink(
       worker_context_provider_(std::move(worker_context_provider)),
       gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
       shared_bitmap_manager_(shared_bitmap_manager) {
-  client_thread_checker_.DetachFromThread();
 }
 
 CompositorFrameSink::CompositorFrameSink(
@@ -35,7 +34,6 @@ CompositorFrameSink::CompositorFrameSink(
     : vulkan_context_provider_(vulkan_context_provider),
       gpu_memory_buffer_manager_(nullptr),
       shared_bitmap_manager_(nullptr) {
-  client_thread_checker_.DetachFromThread();
 }
 
 CompositorFrameSink::~CompositorFrameSink() {
@@ -44,7 +42,6 @@ CompositorFrameSink::~CompositorFrameSink() {
 }
 
 bool CompositorFrameSink::BindToClient(CompositorFrameSinkClient* client) {
-  DCHECK(client_thread_checker_.CalledOnValidThread());
   DCHECK(client);
   DCHECK(!client_);
   client_ = client;
@@ -69,7 +66,6 @@ bool CompositorFrameSink::BindToClient(CompositorFrameSinkClient* client) {
 }
 
 void CompositorFrameSink::DetachFromClient() {
-  DCHECK(client_thread_checker_.CalledOnValidThread());
   DCHECK(client_);
 
   if (context_provider_.get()) {

cc/output/compositor_frame_sink.h

@@ -129,7 +129,6 @@ class CC_EXPORT CompositorFrameSink {
   scoped_refptr<VulkanContextProvider> vulkan_context_provider_;
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
   SharedBitmapManager* shared_bitmap_manager_;
-  base::ThreadChecker client_thread_checker_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CompositorFrameSink);

content/renderer/gpu/renderer_compositor_frame_sink.cc

@@ -50,6 +50,7 @@ RendererCompositorFrameSink::RendererCompositorFrameSink(
   DCHECK(frame_swap_message_queue_);
   DCHECK(message_sender_);
   DCHECK(begin_frame_source_);
+  thread_checker_.DetachFromThread();
 }
 
 RendererCompositorFrameSink::RendererCompositorFrameSink(
@@ -70,12 +71,14 @@ RendererCompositorFrameSink::RendererCompositorFrameSink(
   DCHECK(frame_swap_message_queue_);
   DCHECK(message_sender_);
   DCHECK(begin_frame_source_);
+  thread_checker_.DetachFromThread();
 }
 
 RendererCompositorFrameSink::~RendererCompositorFrameSink() = default;
 
 bool RendererCompositorFrameSink::BindToClient(
     cc::CompositorFrameSinkClient* client) {
+  DCHECK(thread_checker_.CalledOnValidThread());
   if (!cc::CompositorFrameSink::BindToClient(client))
     return false;
 
@@ -92,6 +95,7 @@ bool RendererCompositorFrameSink::BindToClient(
 }
 
 void RendererCompositorFrameSink::DetachFromClient() {
+  DCHECK(thread_checker_.CalledOnValidThread());
   client_->SetBeginFrameSource(nullptr);
   // Destroy the begin frame source on the same thread it was bound on.
   // The CompositorFrameSink itself is destroyed on the main thread.
@@ -123,7 +127,7 @@ void RendererCompositorFrameSink::SubmitCompositorFrame(
 
 void RendererCompositorFrameSink::OnMessageReceived(
     const IPC::Message& message) {
-  DCHECK(client_thread_checker_.CalledOnValidThread());
+  DCHECK(thread_checker_.CalledOnValidThread());
   IPC_BEGIN_MESSAGE_MAP(RendererCompositorFrameSink, message)
     IPC_MESSAGE_HANDLER(ViewMsg_ReclaimCompositorResources,
                         OnReclaimCompositorResources);

content/renderer/gpu/renderer_compositor_frame_sink.h

@@ -103,6 +103,7 @@ class RendererCompositorFrameSink
   scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
   std::unique_ptr<cc::BeginFrameSource> begin_frame_source_;
   int routing_id_;
+  base::ThreadChecker thread_checker_;
 };
 
 }  // namespace content