Refactor WebGraphicsContext3DInProcess and TestWebGraphicsContext3D

webkit/support/test_webkit_platform_support.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 "webkit/support/test_webkit_platform_support.h"
 
 #include "base/file_util.h"
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 356 matching lines @@
   return active_theme_engine_;
 }
 #endif
 
 WebKit::WebSharedWorkerRepository*
 TestWebKitPlatformSupport::sharedWorkerRepository() {
   return NULL;
 }
 
 WebKit::WebGraphicsContext3D*
-TestWebKitPlatformSupport::createGraphicsContext3D() {
-  switch (webkit_support::GetGraphicsContext3DImplementation()) {
-    case webkit_support::IN_PROCESS:
-      return new webkit::gpu::WebGraphicsContext3DInProcessImpl(
-          gfx::kNullPluginWindow, NULL);
-    case webkit_support::IN_PROCESS_COMMAND_BUFFER:
-      return new webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl();
-    default:
-      CHECK(false) << "Unknown GraphicsContext3D Implementation";
-      return NULL;
-  }
-}
-
-WebKit::WebGraphicsContext3D*
 TestWebKitPlatformSupport::createOffscreenGraphicsContext3D(
     const WebKit::WebGraphicsContext3D::Attributes& attributes) {
-  scoped_ptr<WebKit::WebGraphicsContext3D> context;
   switch (webkit_support::GetGraphicsContext3DImplementation()) {
     case webkit_support::IN_PROCESS:
-      context.reset(new webkit::gpu::WebGraphicsContext3DInProcessImpl(
-          gfx::kNullPluginWindow, NULL));
-      break;
-    case webkit_support::IN_PROCESS_COMMAND_BUFFER:
-      context.reset(
+      return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView(
+          attributes, NULL, false);
+    case webkit_support::IN_PROCESS_COMMAND_BUFFER: {
+      scoped_ptr<WebKit::WebGraphicsContext3D> context(
           new webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl());
-      break;
+      if (!context->initialize(attributes, NULL, false))
+        return NULL;
+      return context.release();
+    }
   }
-  if (!context->initialize(attributes, NULL, false))
-    return NULL;
-  return context.release();
+  NOTREACHED();
+  return NULL;
 }
 
 double TestWebKitPlatformSupport::audioHardwareSampleRate() {
   return 44100.0;
 }
 
 size_t TestWebKitPlatformSupport::audioHardwareBufferSize() {
   return 128;
 }
 
@@ skipping 39 matching lines @@
     const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
   return SimpleResourceLoaderBridge::Create(request_info);
 }
 
 webkit_glue::WebSocketStreamHandleBridge*
 TestWebKitPlatformSupport::CreateWebSocketBridge(
     WebKit::WebSocketStreamHandle* handle,
     webkit_glue::WebSocketStreamHandleDelegate* delegate) {
   return SimpleSocketStreamBridge::Create(handle, delegate);
 }