summaryrefslogtreecommitdiff
path: root/chromium/content
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-06-29 11:07:49 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-05-02 17:31:38 +0200
commit04d371bb33e1367fdc79b3ae879d38e216c11f73 (patch)
tree90838c161ea8893a0fe4232c30294ac6c8c68bfa /chromium/content
parent13abed38e4daa6322abaf3a3ad4417f7419036e1 (diff)
downloadqtwebengine-chromium-04d371bb33e1367fdc79b3ae879d38e216c11f73.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> Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/content')
-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 f34ec6fb27a..b0c45f1bd15 100644
--- a/chromium/content/app/content_main_runner.cc
+++ b/chromium/content/app/content_main_runner.cc
@@ -628,7 +628,9 @@ class ContentMainRunnerImpl : public ContentMainRunner {
PopulateFDsFromCommandLine();
#endif
+#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