diff options
author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-06 13:06:31 +0000 |
---|---|---|
committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-06 13:06:31 +0000 |
commit | 80d88e55fda2fe9546bc1b0d135f3c989afb91f4 (patch) | |
tree | 1832c3a2879d76caf39e453b309558b91e0ed7f3 /webkit | |
parent | 1c92d862e80c00d76f08eff0d201bd0c4711cd06 (diff) | |
download | chromium_src-80d88e55fda2fe9546bc1b0d135f3c989afb91f4.zip chromium_src-80d88e55fda2fe9546bc1b0d135f3c989afb91f4.tar.gz chromium_src-80d88e55fda2fe9546bc1b0d135f3c989afb91f4.tar.bz2 |
Remove deprecated and unused webkit_support::CreateLTV() functions
Callers to these removed in WebKit r144705, which we've rolled well past.
R=enne@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12480006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/support/webkit_support.cc | 38 | ||||
-rw-r--r-- | webkit/support/webkit_support.h | 7 |
2 files changed, 5 insertions, 40 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index bc9f492..fee9df5 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -524,18 +524,6 @@ WebKit::WebGraphicsContext3D* CreateGraphicsContext3D( return NULL; } -static WebKit::WebLayerTreeView* CreateLayerTreeView( - 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, @@ -545,29 +533,13 @@ WebKit::WebLayerTreeView* CreateLayerTreeView( 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; + scoped_ptr<WebKit::WebLayerTreeViewImplForTesting> view( + new WebKit::WebLayerTreeViewImplForTesting(type, client)); - 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()); - return CreateLayerTreeView(type, client, compositor_thread.Pass()); -} -WebKit::WebLayerTreeView* CreateLayerTreeViewSoftware( - DRTLayerTreeViewClient* client) { - return CreateLayerTreeView(SOFTWARE_CONTEXT, client); -} -WebKit::WebLayerTreeView* CreateLayerTreeView3d( - DRTLayerTreeViewClient* client) { - return CreateLayerTreeView(MESA_CONTEXT, client); + if (!view->initialize(compositor_thread.Pass())) + return NULL; + return view.release(); } void SetThreadedCompositorEnabled(bool enabled) { diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h index dccc706..8fb6b34 100644 --- a/webkit/support/webkit_support.h +++ b/webkit/support/webkit_support.h @@ -151,13 +151,6 @@ WebKit::WebLayerTreeView* CreateLayerTreeView( DRTLayerTreeViewClient* client, WebKit::WebThread* thread); -// DEPRECATED. TODO(jamesr): Remove these two after fixing WebKit-side callers. -WebKit::WebLayerTreeView* CreateLayerTreeViewSoftware( - DRTLayerTreeViewClient* client); -WebKit::WebLayerTreeView* CreateLayerTreeView3d( - DRTLayerTreeViewClient* client); - -#define WEBKIT_SUPPORT_HAS_SET_THREADING_COMPOSITING_ENABLED 1 void SetThreadedCompositorEnabled(bool enabled); // ------- URL load mocking. |