summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-20 18:26:15 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-20 18:26:15 +0000
commit810d40b7969be4da75695a82699e3c8620ac4b66 (patch)
tree2f7f78b7210edb0cfa0bacadfec1943fd3740076 /ui
parentfe218424336071b7e1aaadb20f1e236d34c635de (diff)
downloadchromium_src-810d40b7969be4da75695a82699e3c8620ac4b66.zip
chromium_src-810d40b7969be4da75695a82699e3c8620ac4b66.tar.gz
chromium_src-810d40b7969be4da75695a82699e3c8620ac4b66.tar.bz2
cc: Remove cc::Thread and cc::ThreadImpl.
These classes are replaced by using base::SingleThreadTaskRunner directly. R=piman,jamesr BUG=251134 Depends on: https://codereview.chromium.org/17362002/ Review URL: https://chromiumcodereview.appspot.com/17114008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207491 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/compositor/compositor.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index b06f205..e9e5181 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -16,7 +16,6 @@
#include "base/threading/thread.h"
#include "base/threading/thread_restrictions.h"
#include "cc/base/switches.h"
-#include "cc/base/thread_impl.h"
#include "cc/input/input_handler.h"
#include "cc/layers/layer.h"
#include "cc/output/context_provider.h"
@@ -523,13 +522,10 @@ Compositor::Compositor(CompositorDelegate* delegate,
settings.initial_debug_state.show_non_occluding_rects =
command_line->HasSwitch(cc::switches::kUIShowNonOccludingRects);
- scoped_ptr<cc::Thread> thread;
- if (g_compositor_thread) {
- thread = cc::ThreadImpl::CreateForDifferentThread(
- g_compositor_thread->message_loop_proxy());
- }
+ scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner =
+ g_compositor_thread ? g_compositor_thread->message_loop_proxy() : NULL;
- host_ = cc::LayerTreeHost::Create(this, settings, thread.Pass());
+ host_ = cc::LayerTreeHost::Create(this, settings, compositor_task_runner);
host_->SetRootLayer(root_web_layer_);
host_->SetLayerTreeHostClientReady();
}