diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-03 22:53:52 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-03 22:53:52 +0000 |
| commit | 90510d983b315d185d7b76a460f286115ccb4d6a (patch) | |
| tree | 687c873b590e677179bfec6bf22fe4dbe1420dad /ui | |
| parent | b06a5dc208561e1968fdec85a3de8c6a731cb4c8 (diff) | |
| download | chromium_src-90510d983b315d185d7b76a460f286115ccb4d6a.zip chromium_src-90510d983b315d185d7b76a460f286115ccb4d6a.tar.gz chromium_src-90510d983b315d185d7b76a460f286115ccb4d6a.tar.bz2 | |
Merge 83778 - Fix crash due to using secondary X11 connection on main thread.
BUG=79358
TEST=Manual.
Review URL: http://codereview.chromium.org/6902179
TBR=dimich@chromium.org
Review URL: http://codereview.chromium.org/6922003
git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@83987 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/x/x11_util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc index f7c9c26..3cc80d6 100644 --- a/ui/base/x/x11_util.cc +++ b/ui/base/x/x11_util.cc @@ -231,7 +231,7 @@ bool GetWindowRect(XID window, gfx::Rect* rect) { &width, &height, &border_width, &depth)) return false; - if (!XTranslateCoordinates(GetSecondaryDisplay(), window, root, + if (!XTranslateCoordinates(GetXDisplay(), window, root, 0, 0, &x, &y, &child)) return false; |