Part 1: Refactor Android WebView graphics code

android_webview/browser/deferred_gpu_command_service.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 "android_webview/browser/deferred_gpu_command_service.h"
 
+#include "android_webview/browser/compositor_proxy.h"
 #include "android_webview/browser/gl_view_renderer_manager.h"
-#include "android_webview/browser/shared_renderer_state.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/synchronization/lock.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "gpu/command_buffer/service/shader_translator_cache.h"
 
 namespace android_webview {
 
 namespace {
 base::LazyInstance<scoped_refptr<DeferredGpuCommandService> >
@@ skipping 44 matching lines @@
 DeferredGpuCommandService::DeferredGpuCommandService() {}
 
 DeferredGpuCommandService::~DeferredGpuCommandService() {
   base::AutoLock lock(tasks_lock_);
   DCHECK(tasks_.empty());
 }
 
 // This method can be called on any thread.
 // static
 void DeferredGpuCommandService::RequestProcessGL() {
-  SharedRendererState* renderer_state =
+  CompositorProxy* compositor_proxy =
       GLViewRendererManager::GetInstance()->GetMostRecentlyDrawn();
-  if (!renderer_state) {
+  if (!compositor_proxy) {
     LOG(ERROR) << "No hardware renderer. Deadlock likely";
     return;
   }
-  renderer_state->ClientRequestDrawGL();
+  compositor_proxy->ClientRequestDrawGL();
 }
 
 // Called from different threads!
 void DeferredGpuCommandService::ScheduleTask(const base::Closure& task) {
   {
     base::AutoLock lock(tasks_lock_);
     tasks_.push(task);
   }
   if (ScopedAllowGL::IsAllowed()) {
     RunTasks();
@@ skipping 85 matching lines @@
 
 void DeferredGpuCommandService::AddRef() const {
   base::RefCountedThreadSafe<DeferredGpuCommandService>::AddRef();
 }
 
 void DeferredGpuCommandService::Release() const {
   base::RefCountedThreadSafe<DeferredGpuCommandService>::Release();
 }
 
 }  // namespace android_webview