| Index: ui/aura/bench/bench_main.cc
|
| diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc
|
| index 337da8da037916c03844011840bb2e089b2dc836..c5b98c0b5794b6fd3b757b9ec3ffe0c9e95b22df 100644
|
| --- a/ui/aura/bench/bench_main.cc
|
| +++ b/ui/aura/bench/bench_main.cc
|
| @@ -33,6 +33,7 @@
|
| #include "ui/gfx/canvas.h"
|
| #include "ui/gfx/rect.h"
|
| #include "ui/gfx/skia_util.h"
|
| +#include "ui/gfx/x/x11_connection.h"
|
| #include "ui/gl/gl_surface.h"
|
|
|
| #ifndef GL_GLEXT_PROTOTYPES
|
| @@ -40,10 +41,6 @@
|
| #endif
|
| #include "third_party/khronos/GLES2/gl2ext.h"
|
|
|
| -#if defined(USE_X11)
|
| -#include "base/message_loop/message_pump_x11.h"
|
| -#endif
|
| -
|
| using base::TimeTicks;
|
| using ui::Compositor;
|
| using ui::Layer;
|
| @@ -294,7 +291,7 @@ int main(int argc, char** argv) {
|
| #if defined(USE_X11)
|
| // This demo uses InProcessContextFactory which uses X on a separate Gpu
|
| // thread.
|
| - XInitThreads();
|
| + gfx::InitializeThreadedX11();
|
| #endif
|
|
|
| gfx::GLSurface::InitializeOneOff();
|
|
|