Revert of cc: Implement shared worker contexts.

content/renderer/gpu/compositor_output_surface.cc

 // Copyright (c) 2012 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 "content/renderer/gpu/compositor_output_surface.h"
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 32 matching lines @@
       frame_swap_message_queue_(swap_frame_message_queue),
       routing_id_(routing_id),
 #if defined(OS_ANDROID)
       prefers_smoothness_(false),
       main_thread_runner_(base::MessageLoop::current()->task_runner()),
 #endif
       layout_test_mode_(RenderThreadImpl::current()->layout_test_mode()),
       weak_ptrs_(this) {
   DCHECK(output_surface_filter_.get());
   DCHECK(frame_swap_message_queue_.get());
+  DetachFromThread();
   capabilities_.max_frames_pending = 1;
   message_sender_ = RenderThreadImpl::current()->sync_message_filter();
   DCHECK(message_sender_.get());
 }
 
-CompositorOutputSurface::~CompositorOutputSurface() {}
+CompositorOutputSurface::~CompositorOutputSurface() {
+  DCHECK(CalledOnValidThread());
+  if (!HasClient())
+    return;
+  UpdateSmoothnessTakesPriority(false);
+  if (output_surface_proxy_.get())
+    output_surface_proxy_->ClearOutputSurface();
+  output_surface_filter_->RemoveHandlerOnCompositorThread(
+                              routing_id_,
+                              output_surface_filter_handler_);
+}
 
 bool CompositorOutputSurface::BindToClient(
     cc::OutputSurfaceClient* client) {
+  DCHECK(CalledOnValidThread());
+
   if (!cc::OutputSurface::BindToClient(client))
     return false;
 
   output_surface_proxy_ = new CompositorOutputSurfaceProxy(this);
   output_surface_filter_handler_ =
       base::Bind(&CompositorOutputSurfaceProxy::OnMessageReceived,
                  output_surface_proxy_);
   output_surface_filter_->AddHandlerOnCompositorThread(
                               routing_id_,
                               output_surface_filter_handler_);
 
   if (!context_provider()) {
     // Without a GPU context, the memory policy otherwise wouldn't be set.
     client->SetMemoryPolicy(cc::ManagedMemoryPolicy(
         128 * 1024 * 1024,
         gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE,
         base::SharedMemory::GetHandleLimit() / 3));
   }
 
   return true;
 }
 
-void CompositorOutputSurface::DetachFromClient() {
-  if (!HasClient())
-    return;
-  UpdateSmoothnessTakesPriority(false);
-  if (output_surface_proxy_.get())
-    output_surface_proxy_->ClearOutputSurface();
-  output_surface_filter_->RemoveHandlerOnCompositorThread(
-      routing_id_, output_surface_filter_handler_);
-  cc::OutputSurface::DetachFromClient();
-}
-
 void CompositorOutputSurface::ShortcutSwapAck(
     uint32 output_surface_id,
     scoped_ptr<cc::GLFrameData> gl_frame_data) {
   if (!layout_test_previous_frame_ack_) {
     layout_test_previous_frame_ack_.reset(new cc::CompositorFrameAck);
     layout_test_previous_frame_ack_->gl_frame_data.reset(new cc::GLFrameData);
   }
 
   OnSwapAck(output_surface_id, *layout_test_previous_frame_ack_);
 
@@ skipping 42 matching lines @@
                                                output_surface_id_,
                                                *frame,
                                                messages_to_deliver_with_frame));
       // ~send_message_scope.
     }
     client_->DidSwapBuffers();
   }
 }
 
 void CompositorOutputSurface::OnMessageReceived(const IPC::Message& message) {
-  DCHECK(client_thread_checker_.CalledOnValidThread());
+  DCHECK(CalledOnValidThread());
   if (!HasClient())
     return;
   IPC_BEGIN_MESSAGE_MAP(CompositorOutputSurface, message)
     IPC_MESSAGE_HANDLER(ViewMsg_UpdateVSyncParameters,
                         OnUpdateVSyncParametersFromBrowser);
     IPC_MESSAGE_HANDLER(ViewMsg_SwapCompositorFrameAck, OnSwapAck);
     IPC_MESSAGE_HANDLER(ViewMsg_ReclaimCompositorResources, OnReclaimResources);
   IPC_END_MESSAGE_MAP()
 }
 
 void CompositorOutputSurface::OnUpdateVSyncParametersFromBrowser(
     base::TimeTicks timebase,
     base::TimeDelta interval) {
-  DCHECK(client_thread_checker_.CalledOnValidThread());
+  DCHECK(CalledOnValidThread());
   CommitVSyncParameters(timebase, interval);
 }
 
 void CompositorOutputSurface::OnSwapAck(uint32 output_surface_id,
                                         const cc::CompositorFrameAck& ack) {
   // Ignore message if it's a stale one coming from a different output surface
   // (e.g. after a lost context).
   if (output_surface_id != output_surface_id_)
     return;
   ReclaimResources(&ack);
@@ skipping 36 matching lines @@
     main_thread_runner_->PostTask(FROM_HERE,
                                   base::Bind(&SetThreadPriorityToIdle));
   } else {
     main_thread_runner_->PostTask(FROM_HERE,
                                   base::Bind(&SetThreadPriorityToDefault));
   }
 #endif
 }
 
 }  // namespace content