ui/gl/gl_image_glx.cc - Issue 235043005: x11: Remove X11 message-pump.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gl/gl_image_glx.cc

Issue 235043005: x11: Remove X11 message-pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: ui/gl/gl_image_glx.cc

diff --git a/ui/gl/gl_image_glx.cc b/ui/gl/gl_image_glx.cc

index b68a5fe5a068b4f66d49754135d496502f9375ef..4b7e883781cd8160e6bc6c49d38be238088fc6bd 100644

--- a/ui/gl/gl_image_glx.cc

+++ b/ui/gl/gl_image_glx.cc

@@ -12,6 +12,7 @@ extern "C" {

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

#include "base/message_loop/message_loop.h"

+#include "ui/gfx/x/x11_types.h"

#include "ui/gl/gl_bindings.h"

#include "ui/gl/gl_surface_glx.h"

@@ -43,7 +44,7 @@ int TextureFormat(int depth) {

} // namespace anonymous

GLImageGLX::GLImageGLX(gfx::PluginWindowHandle window)

- : display_(base::MessagePumpForUI::GetDefaultXDisplay()),

+ : display_(gfx::GetXDisplay()),

window_(window),

pixmap_(0),

glx_pixmap_(0) {}