Remove WebCompositorSupport::initialize/shutdown dependency from webkit_support::CreateLayerTreeView

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 39 matching lines @@
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/base/file_path_string_conversions.h"
 #include "webkit/compositor_bindings/web_compositor_support_impl.h"
 #include "webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h"
 #include "webkit/fileapi/isolated_context.h"
 #include "webkit/glue/webkit_constants.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
+#include "webkit/glue/webthread_impl.h"
 #include "webkit/glue/weburlrequest_extradata_impl.h"
 #include "webkit/gpu/test_context_provider_factory.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 #if defined(OS_ANDROID)
 #include "webkit/media/android/media_player_bridge_manager_impl.h"
 #include "webkit/media/android/webmediaplayer_in_process_android.h"
 #include "webkit/media/android/webmediaplayer_manager_android.h"
 #endif
 #include "webkit/media/media_stream_client.h"
@@ skipping 447 matching lines @@
       if (!context->Initialize(attributes, NULL))
         return NULL;
       return context.release();
     }
   }
   NOTREACHED();
   return NULL;
 }
 
 static WebKit::WebLayerTreeView* CreateLayerTreeView(
-    WebKit::WebLayerTreeViewImplForTesting::RenderingType type,
-    DRTLayerTreeViewClient* client) {
+    LayerTreeViewType type,
+    DRTLayerTreeViewClient* client,
+    scoped_ptr<cc::Thread> compositor_thread) {
   scoped_ptr<WebKit::WebLayerTreeViewImplForTesting> view(
       new WebKit::WebLayerTreeViewImplForTesting(type, client));
 
+  if (!view->initialize(compositor_thread.Pass()))
+    return NULL;
+  return view.release();
+}
+
+WebKit::WebLayerTreeView* CreateLayerTreeView(
+    LayerTreeViewType type,
+    DRTLayerTreeViewClient* client,
+    WebKit::WebThread* thread) {
+  scoped_ptr<cc::Thread> compositor_thread;
+  if (thread)
+    compositor_thread = cc::ThreadImpl::createForDifferentThread(
+        static_cast<webkit_glue::WebThreadImpl*>(thread)->
+        message_loop()->message_loop_proxy());
+  return CreateLayerTreeView(type, client, compositor_thread.Pass());
+}
+
+// DEPRECATED. TODO(jamesr): Remove these three after fixing WebKit callers.
+static WebKit::WebLayerTreeView* CreateLayerTreeView(
+    LayerTreeViewType type,
+    DRTLayerTreeViewClient* client) {
   scoped_ptr<cc::Thread> compositor_thread;
 
   webkit::WebCompositorSupportImpl* compositor_support_impl =
       test_environment->webkit_platform_support()->compositor_support_impl();
   if (compositor_support_impl->compositor_thread_message_loop_proxy())
     compositor_thread = cc::ThreadImpl::createForDifferentThread(
         compositor_support_impl->compositor_thread_message_loop_proxy());
-
-  if (!view->initialize(compositor_thread.Pass()))
-    return NULL;
-  return view.release();
+  return CreateLayerTreeView(type, client, compositor_thread.Pass());
 }
-
 WebKit::WebLayerTreeView* CreateLayerTreeViewSoftware(
     DRTLayerTreeViewClient* client) {
-  return CreateLayerTreeView(
-      WebKit::WebLayerTreeViewImplForTesting::SOFTWARE_CONTEXT, client);
+  return CreateLayerTreeView(SOFTWARE_CONTEXT, client);
 }
-
 WebKit::WebLayerTreeView* CreateLayerTreeView3d(
     DRTLayerTreeViewClient* client) {
-  return CreateLayerTreeView(
-      WebKit::WebLayerTreeViewImplForTesting::MESA_CONTEXT, client);
+  return CreateLayerTreeView(MESA_CONTEXT, client);
 }
 
 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 RegisterMockedErrorURL(const WebKit::WebURL& url,
@@ skipping 354 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