Revert 263726 "x11: Remove X11 message-pump."

trunk/src/content/common/gpu/media/rendering_helper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/media/rendering_helper.h"
 
 #include "base/bind.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringize_macros.h"
 #include "base/synchronization/waitable_event.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_context_stub_with_extensions.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 
-#if defined(USE_X11)
-#include "ui/gfx/x/x11_types.h"
-#endif
-
 #ifdef GL_VARIANT_GLX
 typedef GLXWindow NativeWindowType;
 struct XFreeDeleter {
   void operator()(void* x) const { ::XFree(x); }
 };
 #else  // EGL
 typedef EGLNativeWindowType NativeWindowType;
 #endif
 
 // Helper for Shader creation.
@@ skipping 78 matching lines @@
 
   CHECK_GT(params.window_dimensions.size(), 0U);
   CHECK_EQ(params.frame_dimensions.size(), params.window_dimensions.size());
   window_dimensions_ = params.window_dimensions;
   frame_dimensions_ = params.frame_dimensions;
   render_as_thumbnails_ = params.render_as_thumbnails;
   message_loop_ = base::MessageLoop::current();
   CHECK_GT(params.num_windows, 0);
 
 #if GL_VARIANT_GLX
-  x_display_ = gfx::GetXDisplay();
+  x_display_ = base::MessagePumpForUI::GetDefaultXDisplay();
   CHECK(x_display_);
   CHECK(glXQueryVersion(x_display_, NULL, NULL));
   const int fbconfig_attr[] = {
     GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
     GLX_RENDER_TYPE, GLX_RGBA_BIT,
     GLX_BIND_TO_TEXTURE_TARGETS_EXT, GLX_TEXTURE_2D_BIT_EXT,
     GLX_BIND_TO_TEXTURE_RGB_EXT, GL_TRUE,
     GLX_DOUBLEBUFFER, True,
     GL_NONE,
   };
@@ skipping 11 matching lines @@
       reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS)));
   stub_context->SetGLVersionString(
       reinterpret_cast<const char*>(glGetString(GL_VERSION)));
 
 #else // EGL
   EGLNativeDisplayType native_display;
 
 #if defined(OS_WIN)
   native_display = EGL_DEFAULT_DISPLAY;
 #else
-  x_display_ = gfx::GetXDisplay();
+  x_display_ = base::MessagePumpForUI::GetDefaultXDisplay();
   CHECK(x_display_);
   native_display = x_display_;
 #endif
 
   gl_display_ = eglGetDisplay(native_display);
   CHECK(gl_display_);
   CHECK(eglInitialize(gl_display_, NULL, NULL)) << glGetError();
 
   static EGLint rgba8888[] = {
     EGL_RED_SIZE, 8,
@@ skipping 399 matching lines @@
     *rgb_ptr++ = *rgba_ptr++;
     solid = solid && (*rgba_ptr == 0xff);
     rgba_ptr++;
   }
   *alpha_solid = solid;
 
   done->Signal();
 }
 
 }  // namespace content