summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-06-29 11:07:49 +0200
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-07-08 12:22:06 +0000
commit9f55feaa831d4d31f7cf585da40a35f15e390761 (patch)
tree81a7b3de50940a198b997d4e1212a1be1e1369d7
parent1bbe1a74f991fe1c748990a9d41bf90978d47be6 (diff)
downloadqtwebengine-chromium-9f55feaa831d4d31f7cf585da40a35f15e390761.tar.gz
<chromium> Disable termination on out of memory.
By default chromium installs a new_handler that calls exit() when new/malloc fail to allocate memory. While this is a reasonable thing to do for a browser, a library should leave the decision to the user. Change-Id: Ice5ff8a3347a9df836fb298fed1e80bf21e6b7dc Task-number: QTBUG-45459 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-rw-r--r--chromium/content/app/content_main_runner.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/content/app/content_main_runner.cc b/chromium/content/app/content_main_runner.cc
index 223ffc289f1..a53002f4099 100644
--- a/chromium/content/app/content_main_runner.cc
+++ b/chromium/content/app/content_main_runner.cc
@@ -578,7 +578,9 @@ class ContentMainRunnerImpl : public ContentMainRunner {
base::CommandLine::Init(argc, argv);
+#if !defined(TOOLKIT_QT)
base::EnableTerminationOnHeapCorruption();
+#endif
// TODO(yiyaoliu, vadimt): Remove this once crbug.com/453640 is fixed.
// Enable profiler recording right after command line is initialized so that