Refactor WebGraphicsContext3DInProcess and TestWebGraphicsContext3D

webkit/support/webkit_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/webkit_support.h"
 
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 56 matching lines @@
 using WebKit::WebCString;
 using WebKit::WebDevToolsAgentClient;
 using WebKit::WebFileSystem;
 using WebKit::WebFileSystemCallbacks;
 using WebKit::WebFrame;
 using WebKit::WebMediaPlayerClient;
 using WebKit::WebPlugin;
 using WebKit::WebPluginParams;
 using WebKit::WebString;
 using WebKit::WebURL;
+using webkit::gpu::WebGraphicsContext3DInProcessImpl;
+using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
 
 namespace {
 
 // All fatal log messages (e.g. DCHECK failures) imply unit test failures
 void UnitTestAssertHandler(const std::string& str) {
   FAIL() << str;
 }
 
 void InitLogging(bool enable_gp_fault_error_box) {
   logging::SetLogAssertHandler(UnitTestAssertHandler);
@@ skipping 278 matching lines @@
 }
 
 GraphicsContext3DImplementation GetGraphicsContext3DImplementation() {
   return g_graphics_context_3d_implementation;
 }
 
 WebKit::WebGraphicsContext3D* CreateGraphicsContext3D(
     const WebKit::WebGraphicsContext3D::Attributes& attributes,
     WebKit::WebView* web_view,
     bool direct) {
-  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(
-          new webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl());
-      break;
+      return WebGraphicsContext3DInProcessImpl::CreateForWebView(
+          attributes, web_view, direct);
+    case webkit_support::IN_PROCESS_COMMAND_BUFFER: {
+      scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context(
+          new WebGraphicsContext3DInProcessCommandBufferImpl());
+      if (!context->initialize(attributes, web_view, direct))
+        return NULL;
+      return context.release();
+    }
   }
-  if (!context->initialize(attributes, web_view, direct))
-    return NULL;
-  return context.release();
+  NOTREACHED();
+  return NULL;
 }
 
 void RegisterMockedURL(const WebKit::WebURL& url,
                      const WebKit::WebURLResponse& response,
                      const WebKit::WebString& file_path) {
   test_environment->webkit_platform_support()->url_loader_factory()->
       RegisterURL(url, response, file_path);
 }
 
 void UnregisterMockedURL(const WebKit::WebURL& url) {
@@ skipping 273 matching lines @@
 // Logging
 void EnableWebCoreLogChannels(const std::string& channels) {
   webkit_glue::EnableWebCoreLogChannels(channels);
 }
 
 void SetGamepadData(const WebKit::WebGamepads& pads) {
   test_environment->webkit_platform_support()->setGamepadData(pads);
 }
 
 }  // namespace webkit_support