diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-06 21:25:34 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-06 21:25:34 +0000 |
| commit | 5dd41398f51f54b0283db7495bf1a527cba1bc3f (patch) | |
| tree | 4ae4ce67793f340f9046885cacdff132269c570f /base/message_loop | |
| parent | 1adee7f6b118e851f6dbf0e5a147831659567ce0 (diff) | |
| download | chromium_src-5dd41398f51f54b0283db7495bf1a527cba1bc3f.zip chromium_src-5dd41398f51f54b0283db7495bf1a527cba1bc3f.tar.gz chromium_src-5dd41398f51f54b0283db7495bf1a527cba1bc3f.tar.bz2 | |
x11: Initialize the connection to X11 display with the message-pump.
r262008 moved the initialization of the X11 connection from the MessagePumpX11
ctor, and changed it to be created only when it's necessary. But this causes
unexpected flakiness in some tests (e.g. content_browsertests on ChromeOS). So
restore the creation of the X11 connection in the message-pump ctor.
BUG=354062
TBR=sky@chromium.org, darin@chromium.org
Review URL: https://codereview.chromium.org/227283002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262061 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop')
| -rw-r--r-- | base/message_loop/message_pump_x11.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/base/message_loop/message_pump_x11.cc b/base/message_loop/message_pump_x11.cc index cee54fd..69d574c 100644 --- a/base/message_loop/message_pump_x11.cc +++ b/base/message_loop/message_pump_x11.cc @@ -28,7 +28,9 @@ Display* g_xdisplay = NULL; } // namespace -MessagePumpX11::MessagePumpX11() : MessagePumpGlib() {} +MessagePumpX11::MessagePumpX11() : MessagePumpGlib() { + GetDefaultXDisplay(); +} MessagePumpX11::~MessagePumpX11() { if (g_xdisplay) { |