Upstream version 10.39.233.0

[platform/framework/web/crosswalk.git] / src / ozone / wayland / display_poll_thread.cc

diff --git a/src/ozone/wayland/display_poll_thread.cc b/src/ozone/wayland/display_poll_thread.cc
index 05e5216..4d24c99 100644 (file)
--- a/src/ozone/wayland/display_poll_thread.cc
+++ b/src/ozone/wayland/display_poll_thread.cc
@@ -65,8 +65,7 @@ WaylandDisplayPollThread::WaylandDisplayPollThread(wl_display* display)
 }
 
 WaylandDisplayPollThread::~WaylandDisplayPollThread() {
-  DCHECK(!polling_.IsSignaled());
-  Stop();
+  StopProcessingEvents();
 }
 
 void WaylandDisplayPollThread::StartProcessingEvents() {
@@ -82,6 +81,12 @@ void WaylandDisplayPollThread::StartProcessingEvents() {
 void WaylandDisplayPollThread::StopProcessingEvents() {
   if (polling_.IsSignaled())
     stop_polling_.Signal();
+
+  Stop();
+}
+
+void WaylandDisplayPollThread::CleanUp() {
+  SetThreadWasQuitProperly(true);
 }
 
 void  WaylandDisplayPollThread::DisplayRun(WaylandDisplayPollThread* data) {