content/browser/browser_main_loop.cc - Issue 1004043002: Re-land: base: Implement browser process support for discardable memory.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/browser_main_loop.cc

Issue 1004043002: Re-land: base: Implement browser process support for discardable memory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 9 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

« base/test/test_discardable_memory_shmem_allocator.cc ('K') | « chrome/test/base/chrome_unit_test_suite.cc ('k') | content/common/host_discardable_shared_memory_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index 2409bc78f8a26ef634559cd92a218278da491bca..d052230d4d2d8391da363c81b708bf8c03e5e30f 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -41,6 +41,7 @@

#include "content/browser/webui/content_web_ui_controller_factory.h"

#include "content/browser/webui/url_data_manager.h"

#include "content/common/content_switches_internal.h"

+#include "content/common/host_discardable_shared_memory_manager.h"

#include "content/public/browser/browser_main_parts.h"

#include "content/public/browser/browser_shutdown.h"

#include "content/public/browser/content_browser_client.h"

@@ -460,6 +461,9 @@ void BrowserMainLoop::EarlyInitialization() {

gfx::GpuMemoryBuffer::SCANOUT);

#endif

+ base::DiscardableMemoryShmemAllocator::SetInstance(

+ HostDiscardableSharedMemoryManager::current());

if (parts_)

parts_->PostEarlyInitialization();

}