| Index: ui/aura/window_tree_host_x11.cc
|
| diff --git a/ui/aura/window_tree_host_x11.cc b/ui/aura/window_tree_host_x11.cc
|
| index a8d91d6e41f63a42bb2688a7a193159506b8fbf4..21922db090d1c756e7ebcd6dc01840ef400f3c2a 100644
|
| --- a/ui/aura/window_tree_host_x11.cc
|
| +++ b/ui/aura/window_tree_host_x11.cc
|
| @@ -238,7 +238,8 @@ class TouchEventCalibrate : public ui::PlatformEventObserver {
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // WindowTreeHostX11
|
|
|
| -WindowTreeHostX11::WindowTreeHostX11(const gfx::Rect& bounds)
|
| +WindowTreeHostX11::WindowTreeHostX11(const gfx::Rect& bounds,
|
| + ui::ContextFactory* context_factory)
|
| : xdisplay_(gfx::GetXDisplay()),
|
| xwindow_(0),
|
| x_root_window_(DefaultRootWindow(xdisplay_)),
|
| @@ -307,7 +308,7 @@ WindowTreeHostX11::WindowTreeHostX11(const gfx::Rect& bounds)
|
|
|
| XRRSelectInput(xdisplay_, x_root_window_,
|
| RRScreenChangeNotifyMask | RROutputChangeNotifyMask);
|
| - CreateCompositor(GetAcceleratedWidget());
|
| + CreateCompositor(GetAcceleratedWidget(), context_factory);
|
| }
|
|
|
| WindowTreeHostX11::~WindowTreeHostX11() {
|
| @@ -712,8 +713,9 @@ void WindowTreeHostX11::TranslateAndDispatchLocatedEvent(
|
| }
|
|
|
| // static
|
| -WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds) {
|
| - return new WindowTreeHostX11(bounds);
|
| +WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds,
|
| + ui::ContextFactory* context_factory) {
|
| + return new WindowTreeHostX11(bounds, context_factory);
|
| }
|
|
|
| // static
|
|
|