Factor out code from WebGraphicsContext3DInProcessImpl

Move the internal GLInProcessContext class to gpu/command_buffer/client.

This works towards these goals:
- Unifying the WGC3D impls to be able to have one unified class that is simply
a shim from WGC3D to GLES2
- Factor out the in-process version so that non-webkit code can use it without depending on webkit

TBR=jamesr@chromium.org, piman@chromium.org

Review URL: https://codereview.chromium.org/16851003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208612 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 5 insertions, 8 deletions

diff --git a/android_webview/DEPS b/android_webview/DEPS
index 02d8ca9..5f848d2 100644
--- a/android_webview/DEPS
+++ b/android_webview/DEPS
@@ -7,8 +7,8 @@ include_rules = [
   # lib is the top-level target, and must remain a leaf in the dependency tree.
   "-android_webview/lib",
 
-  "!chrome/browser/component",
   "+content/public/common",
+  "+gpu/command_buffer/client",
   "+jni",
   "+net",
   "+skia",
diff --git a/android_webview/browser/DEPS b/android_webview/browser/DEPS
index c535f31..891ec4f 100644
--- a/android_webview/browser/DEPS
+++ b/android_webview/browser/DEPS
@@ -18,8 +18,6 @@ include_rules = [
   "+content/public/browser",
   "+content/public/test",
 
-  "+gpu/command_buffer/client",
-
   "+ui/gfx",
   "+ui/gl",
 
diff --git a/android_webview/browser/gpu_memory_buffer_impl.cc b/android_webview/browser/gpu_memory_buffer_impl.cc
index 9ee37738..7a2e864 100644
--- a/android_webview/browser/gpu_memory_buffer_impl.cc
+++ b/android_webview/browser/gpu_memory_buffer_impl.cc
@@ -7,9 +7,9 @@
 #include "android_webview/public/browser/draw_gl.h"
 #include "base/bind.h"
 #include "base/logging.h"
+#include "gpu/command_buffer/client/gl_in_process_context.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer.h"
 #include "ui/gfx/size.h"
-#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 namespace android_webview {
 
@@ -93,8 +93,7 @@ scoped_ptr<gpu::GpuMemoryBuffer> GpuMemoryBufferImpl::CreateGpuMemoryBuffer(
 void GpuMemoryBufferImpl::SetAwDrawGLFunctionTable(
     AwDrawGLFunctionTable* table) {
   g_gl_draw_functions = table;
-  ::webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl::
-      SetGpuMemoryBufferCreator(&CreateGpuMemoryBuffer);
+  gpu::GLInProcessContext::SetGpuMemoryBufferCreator(&CreateGpuMemoryBuffer);
 }
 
 }  // namespace android_webview
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index 210131c..476f705 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -20,6 +20,7 @@
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
+#include "gpu/command_buffer/client/gl_in_process_context.h"
 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 namespace android_webview {
@@ -42,8 +43,7 @@ AwMainDelegate::~AwMainDelegate() {
 bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
   content::SetContentClient(&content_client_);
 
-  webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl
-      ::EnableVirtualizedContext();
+  gpu::GLInProcessContext::EnableVirtualizedContext();
 
   CommandLine* cl = CommandLine::ForCurrentProcess();
   cl->AppendSwitch(switches::kEnableBeginFrameScheduling);