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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 2094583002: Add MemoryCoordinator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gyp Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
(...skipping 28 matching lines...) Expand all
39 #include "build/build_config.h" 39 #include "build/build_config.h"
40 #include "cc/base/histograms.h" 40 #include "cc/base/histograms.h"
41 #include "cc/base/switches.h" 41 #include "cc/base/switches.h"
42 #include "cc/blink/web_external_bitmap_impl.h" 42 #include "cc/blink/web_external_bitmap_impl.h"
43 #include "cc/blink/web_layer_impl.h" 43 #include "cc/blink/web_layer_impl.h"
44 #include "cc/output/output_surface.h" 44 #include "cc/output/output_surface.h"
45 #include "cc/output/vulkan_in_process_context_provider.h" 45 #include "cc/output/vulkan_in_process_context_provider.h"
46 #include "cc/raster/task_graph_runner.h" 46 #include "cc/raster/task_graph_runner.h"
47 #include "cc/trees/layer_tree_host_common.h" 47 #include "cc/trees/layer_tree_host_common.h"
48 #include "cc/trees/layer_tree_settings.h" 48 #include "cc/trees/layer_tree_settings.h"
49 #include "components/memory_coordinator/child/child_memory_coordinator_impl.h"
49 #include "components/scheduler/child/compositor_worker_scheduler.h" 50 #include "components/scheduler/child/compositor_worker_scheduler.h"
50 #include "components/scheduler/child/webthread_base.h" 51 #include "components/scheduler/child/webthread_base.h"
51 #include "components/scheduler/child/webthread_impl_for_worker_scheduler.h" 52 #include "components/scheduler/child/webthread_impl_for_worker_scheduler.h"
52 #include "components/scheduler/renderer/renderer_scheduler.h" 53 #include "components/scheduler/renderer/renderer_scheduler.h"
53 #include "content/child/appcache/appcache_dispatcher.h" 54 #include "content/child/appcache/appcache_dispatcher.h"
54 #include "content/child/appcache/appcache_frontend_impl.h" 55 #include "content/child/appcache/appcache_frontend_impl.h"
55 #include "content/child/blob_storage/blob_message_filter.h" 56 #include "content/child/blob_storage/blob_message_filter.h"
56 #include "content/child/child_discardable_shared_memory_manager.h" 57 #include "content/child/child_discardable_shared_memory_manager.h"
57 #include "content/child/child_gpu_memory_buffer_manager.h" 58 #include "content/child/child_gpu_memory_buffer_manager.h"
58 #include "content/child/child_histogram_message_filter.h" 59 #include "content/child/child_histogram_message_filter.h"
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 // been initialized by the Zygote before this instance became a Renderer. 792 // been initialized by the Zygote before this instance became a Renderer.
792 media::InitializeMediaLibrary(); 793 media::InitializeMediaLibrary();
793 794
794 #if defined(OS_ANDROID) 795 #if defined(OS_ANDROID)
795 if (!command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode) && 796 if (!command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
796 media::MediaCodecUtil::IsMediaCodecAvailable()) { 797 media::MediaCodecUtil::IsMediaCodecAvailable()) {
797 media::EnablePlatformDecoderSupport(); 798 media::EnablePlatformDecoderSupport();
798 } 799 }
799 #endif 800 #endif
800 801
801 memory_pressure_listener_.reset(new base::MemoryPressureListener( 802 if (command_line.HasSwitch(switches::kEnableMemoryCoordinator)) {
802 base::Bind(&RenderThreadImpl::OnMemoryPressure, base::Unretained(this)), 803 interface_registry()->AddInterface(
803 base::Bind(&RenderThreadImpl::OnSyncMemoryPressure, 804 base::Bind(memory_coordinator::ChildMemoryCoordinatorImpl::Create));
804 base::Unretained(this)))); 805 } else {
806 memory_pressure_listener_.reset(new base::MemoryPressureListener(
807 base::Bind(&RenderThreadImpl::OnMemoryPressure, base::Unretained(this)),
808 base::Bind(&RenderThreadImpl::OnSyncMemoryPressure,
809 base::Unretained(this))));
810 }
805 811
806 int num_raster_threads = 0; 812 int num_raster_threads = 0;
807 std::string string_value = 813 std::string string_value =
808 command_line.GetSwitchValueASCII(switches::kNumRasterThreads); 814 command_line.GetSwitchValueASCII(switches::kNumRasterThreads);
809 bool parsed_num_raster_threads = 815 bool parsed_num_raster_threads =
810 base::StringToInt(string_value, &num_raster_threads); 816 base::StringToInt(string_value, &num_raster_threads);
811 DCHECK(parsed_num_raster_threads) << string_value; 817 DCHECK(parsed_num_raster_threads) << string_value;
812 DCHECK_GT(num_raster_threads, 0); 818 DCHECK_GT(num_raster_threads, 0);
813 819
814 // TODO(vmpstr): If the flag sticks, we should clean it up and always have 820 // TODO(vmpstr): If the flag sticks, we should clean it up and always have
(...skipping 1402 matching lines...) Expand 10 before | Expand all | Expand 10 after
2217 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical) 2223 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical)
2218 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate; 2224 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate;
2219 2225
2220 blink::mainThreadIsolate()->MemoryPressureNotification( 2226 blink::mainThreadIsolate()->MemoryPressureNotification(
2221 v8_memory_pressure_level); 2227 v8_memory_pressure_level);
2222 blink::MemoryPressureNotificationToWorkerThreadIsolates( 2228 blink::MemoryPressureNotificationToWorkerThreadIsolates(
2223 v8_memory_pressure_level); 2229 v8_memory_pressure_level);
2224 } 2230 }
2225 2231
2226 } // namespace content 2232 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698