Check for null XDisplay in TouchFactory::SetCursorVisible

BUG=113456
TEST=none


Review URL: http://codereview.chromium.org/9370033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121373 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 4 deletions

diff --git a/ui/base/touch/touch_factory.cc b/ui/base/touch/touch_factory.cc
index cae979a..ea2731f 100644
--- a/ui/base/touch/touch_factory.cc
+++ b/ui/base/touch/touch_factory.cc
@@ -130,10 +130,13 @@ TouchFactory::~TouchFactory() {
     return;
 #endif
 
-  SetCursorVisible(true, false);
-  Display* display = ui::GetXDisplay();
-  XFreeCursor(display, invisible_cursor_);
-  XFreeCursor(display, arrow_cursor_);
+  // The XDisplay may be lost by the time we get destroyed.
+  if (ui::XDisplayExists()) {
+    SetCursorVisible(true, false);
+    Display* display = ui::GetXDisplay();
+    XFreeCursor(display, invisible_cursor_);
+    XFreeCursor(display, arrow_cursor_);
+  }
 }
 
 void TouchFactory::UpdateDeviceList(Display* display) {
@@ -377,6 +380,10 @@ bool TouchFactory::UngrabTouchDevices(Display* display) {
 }
 
 void TouchFactory::SetCursorVisible(bool show, bool start_timer) {
+  // This function may get called after the display is terminated.
+  if (!ui::XDisplayExists())
+    return;
+
 #if defined(USE_AURA)
   if (!base::MessagePumpForUI::HasXInput2())
     return;