[sailfishos][gecko] MessageLoop fixing.. We should return this back a…

…s well
sailfishos · May 27, 2020 · c159c9c · c159c9c
1 parent 8bbc37f
commit c159c9c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/ipc/chromium/src/base/message_loop.cc b/ipc/chromium/src/base/message_loop.cc
@@ -25,6 +25,9 @@
 #if defined(MOZ_WIDGET_GTK)
 #include "base/message_pump_glib.h"
 #endif
+#ifdef MOZ_WIDGET_QT
+#include "base/message_pump_qt.h"
+#endif
 #endif
 #ifdef ANDROID
 #include "base/message_pump_android.h"

diff --git a/ipc/chromium/src/base/message_loop.h b/ipc/chromium/src/base/message_loop.h
@@ -457,6 +457,7 @@ class MessageLoopForUI : public MessageLoop {
       return NULL;
     Type type = loop->type();
     DCHECK(type == MessageLoop::TYPE_UI ||
+           type == MessageLoop::TYPE_EMBED ||
            type == MessageLoop::TYPE_MOZILLA_PARENT ||
            type == MessageLoop::TYPE_MOZILLA_CHILD);
     return static_cast<MessageLoopForUI*>(loop);

diff --git a/ipc/chromium/src/base/message_pump_qt.h b/ipc/chromium/src/base/message_pump_qt.h
@@ -54,6 +54,9 @@ class MessagePumpForUI : public MessagePump {
   // HandleDispatch is called after the poll has completed.
   void HandleDispatch();
 
+ protected:
+  // This flag is set to false when Run should return.
+  bool keep_running_;
  private:
   // We may make recursive calls to Run, so we save state that needs to be
   // separate between them in this structure type.