Revert of cc: Implement shared worker contexts.

content/browser/android/in_process/synchronous_compositor_factory_impl.cc

 // Copyright 2014 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/browser/android/in_process/synchronous_compositor_factory_impl.h"
 
 #include "base/command_line.h"
 #include "base/observer_list.h"
 #include "base/sys_info.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/browser/android/in_process/context_provider_in_process.h"
 #include "content/browser/android/in_process/synchronous_compositor_context_provider.h"
 #include "content/browser/android/in_process/synchronous_compositor_external_begin_frame_source.h"
 #include "content/browser/android/in_process/synchronous_compositor_impl.h"
 #include "content/browser/android/in_process/synchronous_compositor_output_surface.h"
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/gpu/in_process_gpu_thread.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/gpu/frame_swap_message_queue.h"
 #include "content/renderer/render_thread_impl.h"
 #include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h"
 #include "gpu/command_buffer/client/gl_in_process_context.h"
-#include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_surface_stub.h"
 
 using cc_blink::ContextProviderWebContext;
 using gpu_blink::WebGraphicsContext3DImpl;
 using gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl;
 
 namespace content {
@@ skipping 125 matching lines @@
   return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
 }
 
 scoped_ptr<cc::OutputSurface>
 SynchronousCompositorFactoryImpl::CreateOutputSurface(
     int routing_id,
     int surface_id,
     scoped_refptr<content::FrameSwapMessageQueue> frame_swap_message_queue) {
   scoped_refptr<cc::ContextProvider> onscreen_context =
       CreateContextProviderForCompositor(surface_id, RENDER_COMPOSITOR_CONTEXT);
-
-  bool shared_worker_context_lost = false;
-  if (shared_worker_context_) {
-    // Note: If context is lost, we delete reference after releasing the lock.
-    base::AutoLock lock(*shared_worker_context_->GetLock());
-    if (shared_worker_context_->ContextGL()->GetGraphicsResetStatusKHR() !=
-        GL_NO_ERROR) {
-      shared_worker_context_lost = true;
-    }
-  }
-  // Note: shared worker context support requires |use_ipc_command_buffer_|.
-  if (use_ipc_command_buffer_ &&
-      (!shared_worker_context_ || shared_worker_context_lost)) {
-    // TODO(reveman): This limit is based on the usage required by async
-    // uploads. Determine what a good limit is now that async uploads are
-    // no longer used.
-    unsigned int mapped_memory_reclaim_limit =
-        (base::SysInfo::IsLowEndDevice() ? 2 : 6) * 1024 * 1024;
-    WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits mem_limits;
-    mem_limits.mapped_memory_reclaim_limit = mapped_memory_reclaim_limit;
-    scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context =
-        CreateContext3D(0, GetDefaultAttribs(), mem_limits);
-    shared_worker_context_ =
-        make_scoped_refptr(new SynchronousCompositorContextProvider(
-            context.Pass(), RENDER_WORKER_CONTEXT));
-    if (!shared_worker_context_->BindToCurrentThread())
-      shared_worker_context_ = nullptr;
-    if (shared_worker_context_)
-      shared_worker_context_->SetupLock();
-  }
+  scoped_refptr<cc::ContextProvider> worker_context =
+      CreateContextProviderForCompositor(0, RENDER_WORKER_CONTEXT);
 
   return make_scoped_ptr(new SynchronousCompositorOutputSurface(
-      onscreen_context, shared_worker_context_, routing_id,
-      frame_swap_message_queue));
+      onscreen_context, worker_context, routing_id, frame_swap_message_queue));
 }
 
 InputHandlerManagerClient*
 SynchronousCompositorFactoryImpl::GetInputHandlerManagerClient() {
   return synchronous_input_event_filter();
 }
 
 scoped_ptr<cc::BeginFrameSource>
 SynchronousCompositorFactoryImpl::CreateExternalBeginFrameSource(
     int routing_id) {
@@ skipping 17 matching lines @@
                                           debug_name);
 }
 
 scoped_refptr<cc::ContextProvider>
 SynchronousCompositorFactoryImpl::CreateContextProviderForCompositor(
     int surface_id,
     CommandBufferContextType type) {
   // This is half of what RenderWidget uses because synchronous compositor
   // pipeline is only one frame deep. But twice of half for low end here
   // because 16bit texture is not supported.
-  // TODO(reveman): This limit is based on the usage required by async
-  // uploads. Determine what a good limit is now that async uploads are
-  // no longer used.
   unsigned int mapped_memory_reclaim_limit =
       (base::SysInfo::IsLowEndDevice() ? 2 : 6) * 1024 * 1024;
   blink::WebGraphicsContext3D::Attributes attributes = GetDefaultAttribs();
 
   if (use_ipc_command_buffer_) {
     WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits mem_limits;
     mem_limits.mapped_memory_reclaim_limit = mapped_memory_reclaim_limit;
     scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context =
         CreateContext3D(surface_id, GetDefaultAttribs(), mem_limits);
     return make_scoped_refptr(
@@ skipping 118 matching lines @@
         android_view_service_->sync_point_manager());
   }
   return gpu_thread_service_;
 }
 
 void SynchronousCompositorFactoryImpl::SetUseIpcCommandBuffer() {
   use_ipc_command_buffer_ = true;
 }
 
 }  // namespace content