Chromium Code Reviews| Index: webkit/support/webkit_support.cc |
| diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc |
| index a9dbe95c05ac7c47aa5239b9c3e8538e9ed5d39a..2a0bc8929729238f563251b4567cd1dbcc41fb05 100644 |
| --- a/webkit/support/webkit_support.cc |
| +++ b/webkit/support/webkit_support.cc |
| @@ -28,7 +28,6 @@ |
| #include "base/strings/sys_string_conversions.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "base/time.h" |
| -#include "cc/base/thread_impl.h" |
| #include "googleurl/src/url_util.h" |
| #include "grit/webkit_chromium_resources.h" |
| #include "media/base/filter_collection.h" |
| @@ -464,16 +463,12 @@ 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()); |
| + DCHECK(thread == NULL); |
|
jamesr
2013/06/19 17:33:41
why not DCHECK_EQ, DCHECK(!thread), or something?
danakj
2013/06/19 17:37:01
I'll !thread, was worried about windows but that s
|
| scoped_ptr<webkit::WebLayerTreeViewImplForTesting> view( |
| new webkit::WebLayerTreeViewImplForTesting(type, client)); |
| - if (!view->Initialize(compositor_thread.Pass())) |
| + if (!view->Initialize()) |
| return NULL; |
| return view.release(); |
| } |