| Index: ui/aura/window_tree_host.cc
|
| diff --git a/ui/aura/window_tree_host.cc b/ui/aura/window_tree_host.cc
|
| index 2118c2ebd6af1603eeab722bfdb24a6d505ba17b..1c3cd4ff284993da124e896bb6127fc3a51b3b60 100644
|
| --- a/ui/aura/window_tree_host.cc
|
| +++ b/ui/aura/window_tree_host.cc
|
| @@ -44,7 +44,8 @@ WindowTreeHost::~WindowTreeHost() {
|
|
|
| #if defined(OS_ANDROID)
|
| // static
|
| -WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds) {
|
| +WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds,
|
| + ui::ContextFactory* context_factory) {
|
| // This is only hit for tests and ash, right now these aren't an issue so
|
| // adding the CHECK.
|
| // TODO(sky): decide if we want a factory.
|
| @@ -197,8 +198,10 @@ void WindowTreeHost::DestroyDispatcher() {
|
| }
|
|
|
| void WindowTreeHost::CreateCompositor(
|
| - gfx::AcceleratedWidget accelerated_widget) {
|
| - compositor_.reset(new ui::Compositor(GetAcceleratedWidget()));
|
| + gfx::AcceleratedWidget accelerated_widget,
|
| + ui::ContextFactory* context_factory) {
|
| + compositor_.reset(
|
| + new ui::Compositor(GetAcceleratedWidget(), context_factory));
|
| DCHECK(compositor_.get());
|
| // TODO(beng): I think this setup should probably all move to a "accelerated
|
| // widget available" function.
|
|
|