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

Unified Diff: content/renderer/render_thread_impl.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
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 41137e503dd1d8923984bbeb6950c827312cda56..e53a8f4b2cb1735cb62d4036907fb9db8f57374b 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -656,8 +656,12 @@ void RenderThreadImpl::Init() {
#endif
}
- base::DiscardableMemoryShmemAllocator::SetInstance(
- ChildThreadImpl::discardable_shared_memory_manager());
+ // In single process, browser main loop set up the discardable memory
+ // allocator.
+ if (!command_line.HasSwitch(switches::kSingleProcess)) {
+ base::DiscardableMemoryShmemAllocator::SetInstance(
+ ChildThreadImpl::discardable_shared_memory_manager());
+ }
service_registry()->AddService<RenderFrameSetup>(
base::Bind(CreateRenderFrameSetup));

Powered by Google App Engine
This is Rietveld 408576698