Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1050)

Unified Diff: base/message_loop/message_loop.cc

Issue 733533002: Do not start RunLoop of MessagePumpForUI in NestedMessagePumpAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix failure of FrameTreeBrowserTest.FrameTreeAfterCrash Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/message_loop/message_loop.cc
diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc
index 2f4a03cf7ff3ae0662a467b14a91b9649da296f8..ce0ebe206f6dfb71c401379292115d21f9086ad5 100644
--- a/base/message_loop/message_loop.cc
+++ b/base/message_loop/message_loop.cc
@@ -328,6 +328,12 @@ void MessageLoop::QuitNow() {
DCHECK_EQ(this, current());
if (run_loop_) {
pump_->Quit();
+#if defined(OS_ANDROID)
+ } else if (type_ == TYPE_UI &&
+ static_cast<MessagePumpForUI*>(pump_.get())
+ ->IsRedundantQuitExpected()) {
+ pump_->Quit();
+#endif
} else {
NOTREACHED() << "Must be inside Run to call Quit";
}
« no previous file with comments | « no previous file | base/message_loop/message_pump_android.h » ('j') | content/browser/media/cdm/browser_cdm_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698