diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-14 22:45:15 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-14 22:45:15 +0000 |
| commit | dfca51a8801c7be9db5cb59de202dc0e0c91ccda (patch) | |
| tree | 97d1da099502ede9cf176be622c9355ef5c060e0 /content/common | |
| parent | cfe8004738d9a05e733a7527730e0e712ef22c92 (diff) | |
| download | chromium_src-dfca51a8801c7be9db5cb59de202dc0e0c91ccda.zip chromium_src-dfca51a8801c7be9db5cb59de202dc0e0c91ccda.tar.gz chromium_src-dfca51a8801c7be9db5cb59de202dc0e0c91ccda.tar.bz2 | |
Revert 263726 "x11: Remove X11 message-pump."
Reason for revert: along with 263718 blamed for
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29/builds/45298
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%281%29/builds/29956
> x11: Remove X11 message-pump.
>
> The remaining use of the X11 mesage-pump was opening the connection to the
> X11 server. This patch moves that out of the message-pump, into gfx. This
> allows us to remove the X11 message-pump, and just use the base Glib-based
> message-pump on Linux and ChromeOS.
>
> BUG=354062
> R=darin@chromium.org, sky@chromium.org
>
> Review URL: https://codereview.chromium.org/235043005
TBR=sadrul@chromium.org
Review URL: https://codereview.chromium.org/238093002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
| -rw-r--r-- | content/common/gpu/media/rendering_helper.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/content/common/gpu/media/rendering_helper.cc b/content/common/gpu/media/rendering_helper.cc index 76d29d1..ae1549b 100644 --- a/content/common/gpu/media/rendering_helper.cc +++ b/content/common/gpu/media/rendering_helper.cc @@ -14,10 +14,6 @@ #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 { @@ -116,7 +112,7 @@ void RenderingHelper::Initialize(const RenderingHelperParams& params, 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[] = { @@ -148,7 +144,7 @@ void RenderingHelper::Initialize(const RenderingHelperParams& params, #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 |