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

Unified Diff: content/app/content_main_runner.cc

Issue 891843002: Don't set up an autorelease pool in ContentMainRunner on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 2bd0acdf263416ca92a5529ed4a283aec5ba2d3c..378a5097c32daa484b732525aab59647050f1460 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -578,7 +578,10 @@ class ContentMainRunnerImpl : public ContentMainRunner {
}
#endif // !OS_ANDROID && !OS_IOS
-#if defined(OS_MACOSX)
+ // Don't create this loop on iOS, since the outer loop is already handled
+ // and a loop that's destroyed in shutdown interleaves badly with the event
+ // loop pool on iOS.
+#if defined(OS_MACOSX) && !defined(OS_IOS)
// We need this pool for all the objects created before we get to the
// event loop, but we don't want to leave them hanging around until the
// app quits. Each "main" needs to flush this pool right before it goes into
@@ -822,7 +825,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {
#endif // _CRTDBG_MAP_ALLOC
#endif // OS_WIN
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) && !defined(OS_IOS)
autorelease_pool_.reset(NULL);
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698