From 29bd40509cd5f705d686a97f2c91e3a75501cf2a Mon Sep 17 00:00:00 2001 From: petrcermak Date: Thu, 24 Sep 2015 01:28:48 -0700 Subject: Re-land architecture for cross-process memory notification suppressing This patch re-lands https://codereview.chromium.org/1332583002/ after it was reverted in https://codereview.chromium.org/1359873002/ because it was causing failures on the Cast Linux buildbot. The failures were caused by std::set operations being carried out inside DCHECK macros, which are not evaluated on release builds: DCHECK(memory_message_filters_.insert(filter).second); This patch moves the std::set operations outside the macros so that they would always be evaluated: const bool success = memory_message_filters_.insert(filter).second; DCHECK(success); BUG=516776 Review URL: https://codereview.chromium.org/1361963002 Cr-Commit-Position: refs/heads/master@{#350503} --- content/content_child.gypi | 2 ++ 1 file changed, 2 insertions(+) (limited to 'content/content_child.gypi') diff --git a/content/content_child.gypi b/content/content_child.gypi index 5ad5b67..42587bd 100644 --- a/content/content_child.gypi +++ b/content/content_child.gypi @@ -114,6 +114,8 @@ 'child/indexed_db/webidbdatabase_impl.h', 'child/indexed_db/webidbfactory_impl.cc', 'child/indexed_db/webidbfactory_impl.h', + 'child/memory/child_memory_message_filter.cc', + 'child/memory/child_memory_message_filter.h', 'child/mojo/mojo_application.cc', 'child/mojo/mojo_application.h', 'child/multipart_response_delegate.cc', -- cgit v1.1