generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use XErrorTrap in MouseCursorMonitorX11 to catch the error if the shared window has been closed.

Browse Source 
BUG=crbug/374457
R=sergeyu@chromium.org

Review URL: https://webrtc-codereview.appspot.com/13599004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6359 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
jiayl@webrtc.org 2014-06-06 21:42:00 +00:00
parent 171d94177b
commit b8f582591f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc
View File

@ -17,6 +17,7 @@
#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
#include "webrtc/modules/desktop_capture/desktop_frame.h"
#include "webrtc/modules/desktop_capture/mouse_cursor.h"
#include "webrtc/modules/desktop_capture/x11/x_error_trap.h"
#include "webrtc/system_wrappers/interface/logging.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
@ -145,10 +146,12 @@ void MouseCursorMonitorX11::Capture() {
Window root_window;
Window child_window;
unsigned int mask;
XErrorTrap error_trap(display());
Bool result = XQueryPointer(display(), window_, &root_window, &child_window,
&root_x, &root_y, &win_x, &win_y, &mask);
CursorState state;
if (!result) {
if (!result || error_trap.GetLastErrorAndDisable() != 0) {
state = OUTSIDE;
} else {
// In screen mode (window_ == root_window) the mouse is always inside.