| Index: content/common/gpu/media/rendering_helper.cc
|
| diff --git a/content/common/gpu/media/rendering_helper.cc b/content/common/gpu/media/rendering_helper.cc
|
| index ae1549b85cc49533d54c16d3c60072f5dcb68bf4..76d29d1a1ea0a00e8d86f8438e4ab98c9fc9c05d 100644
|
| --- a/content/common/gpu/media/rendering_helper.cc
|
| +++ b/content/common/gpu/media/rendering_helper.cc
|
| @@ -14,6 +14,10 @@
|
| #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 {
|
| @@ -112,7 +116,7 @@ void RenderingHelper::Initialize(const RenderingHelperParams& params,
|
| CHECK_GT(params.num_windows, 0);
|
|
|
| #if GL_VARIANT_GLX
|
| - x_display_ = base::MessagePumpForUI::GetDefaultXDisplay();
|
| + x_display_ = gfx::GetXDisplay();
|
| CHECK(x_display_);
|
| CHECK(glXQueryVersion(x_display_, NULL, NULL));
|
| const int fbconfig_attr[] = {
|
| @@ -144,7 +148,7 @@ void RenderingHelper::Initialize(const RenderingHelperParams& params,
|
| #if defined(OS_WIN)
|
| native_display = EGL_DEFAULT_DISPLAY;
|
| #else
|
| - x_display_ = base::MessagePumpForUI::GetDefaultXDisplay();
|
| + x_display_ = gfx::GetXDisplay();
|
| CHECK(x_display_);
|
| native_display = x_display_;
|
| #endif
|
|
|