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

Side by Side Diff: components/display_compositor/renderer_frame_manager.cc

Issue 2811083002: Move frame eviction into components (Closed)
Patch Set: Created 3 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/renderer_host/renderer_frame_manager.h" 5 #include "components/display_compositor/renderer_frame_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/memory_coordinator_client_registry.h" 11 #include "base/memory/memory_coordinator_client_registry.h"
12 #include "base/memory/memory_coordinator_proxy.h" 12 #include "base/memory/memory_coordinator_proxy.h"
13 #include "base/memory/memory_pressure_listener.h" 13 #include "base/memory/memory_pressure_listener.h"
14 #include "base/memory/memory_pressure_monitor.h" 14 #include "base/memory/memory_pressure_monitor.h"
15 #include "base/memory/shared_memory.h" 15 #include "base/memory/shared_memory.h"
16 #include "base/sys_info.h" 16 #include "base/sys_info.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "components/display_compositor/display_compositor_features.h"
18 #include "components/display_compositor/host_shared_bitmap_manager.h" 19 #include "components/display_compositor/host_shared_bitmap_manager.h"
19 #include "content/public/common/content_features.h"
20 20
21 namespace content { 21 namespace display_compositor {
22 namespace { 22 namespace {
23 23
24 const int kModeratePressurePercentage = 50; 24 const int kModeratePressurePercentage = 50;
25 const int kCriticalPressurePercentage = 10; 25 const int kCriticalPressurePercentage = 10;
26 26
27 } // namespace 27 } // namespace
28 28
29 RendererFrameManager* RendererFrameManager::GetInstance() { 29 RendererFrameManager* RendererFrameManager::GetInstance() {
30 return base::Singleton<RendererFrameManager>::get(); 30 return base::Singleton<RendererFrameManager>::get();
31 } 31 }
(...skipping 11 matching lines...) Expand all
43 void RendererFrameManager::RemoveFrame(RendererFrameManagerClient* frame) { 43 void RendererFrameManager::RemoveFrame(RendererFrameManagerClient* frame) {
44 std::map<RendererFrameManagerClient*, size_t>::iterator locked_iter = 44 std::map<RendererFrameManagerClient*, size_t>::iterator locked_iter =
45 locked_frames_.find(frame); 45 locked_frames_.find(frame);
46 if (locked_iter != locked_frames_.end()) 46 if (locked_iter != locked_frames_.end())
47 locked_frames_.erase(locked_iter); 47 locked_frames_.erase(locked_iter);
48 unlocked_frames_.remove(frame); 48 unlocked_frames_.remove(frame);
49 } 49 }
50 50
51 void RendererFrameManager::LockFrame(RendererFrameManagerClient* frame) { 51 void RendererFrameManager::LockFrame(RendererFrameManagerClient* frame) {
52 std::list<RendererFrameManagerClient*>::iterator unlocked_iter = 52 std::list<RendererFrameManagerClient*>::iterator unlocked_iter =
53 std::find(unlocked_frames_.begin(), unlocked_frames_.end(), frame); 53 std::find(unlocked_frames_.begin(), unlocked_frames_.end(), frame);
54 if (unlocked_iter != unlocked_frames_.end()) { 54 if (unlocked_iter != unlocked_frames_.end()) {
55 DCHECK(locked_frames_.find(frame) == locked_frames_.end()); 55 DCHECK(locked_frames_.find(frame) == locked_frames_.end());
56 unlocked_frames_.remove(frame); 56 unlocked_frames_.remove(frame);
57 locked_frames_[frame] = 1; 57 locked_frames_[frame] = 1;
58 } else { 58 } else {
59 DCHECK(locked_frames_.find(frame) != locked_frames_.end()); 59 DCHECK(locked_frames_.find(frame) != locked_frames_.end());
60 locked_frames_[frame]++; 60 locked_frames_[frame]++;
61 } 61 }
62 } 62 }
63 63
64 void RendererFrameManager::UnlockFrame(RendererFrameManagerClient* frame) { 64 void RendererFrameManager::UnlockFrame(RendererFrameManagerClient* frame) {
65 DCHECK(locked_frames_.find(frame) != locked_frames_.end()); 65 DCHECK(locked_frames_.find(frame) != locked_frames_.end());
66 size_t locked_count = locked_frames_[frame]; 66 size_t locked_count = locked_frames_[frame];
67 DCHECK(locked_count); 67 DCHECK(locked_count);
68 if (locked_count > 1) { 68 if (locked_count > 1) {
69 locked_frames_[frame]--; 69 locked_frames_[frame]--;
70 } else { 70 } else {
71 RemoveFrame(frame); 71 RemoveFrame(frame);
72 unlocked_frames_.push_front(frame); 72 unlocked_frames_.push_front(frame);
73 CullUnlockedFrames(GetMaxNumberOfSavedFrames()); 73 CullUnlockedFrames(GetMaxNumberOfSavedFrames());
74 } 74 }
75 } 75 }
76 76
77 size_t RendererFrameManager::GetMaxNumberOfSavedFrames() const { 77 size_t RendererFrameManager::GetMaxNumberOfSavedFrames() const {
78 int percentage = 100; 78 int percentage = 100;
79 if (base::FeatureList::IsEnabled(features::kMemoryCoordinator)) { 79 if (base::FeatureList::IsEnabled(features::kMemoryCoordinator)) {
80 switch (base::MemoryCoordinatorProxy::GetInstance()-> 80 switch (
81 GetCurrentMemoryState()) { 81 base::MemoryCoordinatorProxy::GetInstance()->GetCurrentMemoryState()) {
82 case base::MemoryState::NORMAL: 82 case base::MemoryState::NORMAL:
83 percentage = 100; 83 percentage = 100;
84 break; 84 break;
85 case base::MemoryState::THROTTLED: 85 case base::MemoryState::THROTTLED:
86 percentage = kCriticalPressurePercentage; 86 percentage = kCriticalPressurePercentage;
87 break; 87 break;
88 case base::MemoryState::SUSPENDED: 88 case base::MemoryState::SUSPENDED:
89 case base::MemoryState::UNKNOWN: 89 case base::MemoryState::UNKNOWN:
90 NOTREACHED(); 90 NOTREACHED();
91 break; 91 break;
(...skipping 16 matching lines...) Expand all
108 case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL: 108 case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL:
109 percentage = kCriticalPressurePercentage; 109 percentage = kCriticalPressurePercentage;
110 break; 110 break;
111 } 111 }
112 } 112 }
113 size_t frames = (max_number_of_saved_frames_ * percentage) / 100; 113 size_t frames = (max_number_of_saved_frames_ * percentage) / 100;
114 return std::max(static_cast<size_t>(1), frames); 114 return std::max(static_cast<size_t>(1), frames);
115 } 115 }
116 116
117 RendererFrameManager::RendererFrameManager() 117 RendererFrameManager::RendererFrameManager()
118 : memory_pressure_listener_(new base::MemoryPressureListener( 118 : memory_pressure_listener_(new base::MemoryPressureListener(
119 base::Bind(&RendererFrameManager::OnMemoryPressure, 119 base::Bind(&RendererFrameManager::OnMemoryPressure,
120 base::Unretained(this)))) { 120 base::Unretained(this)))) {
121 base::MemoryCoordinatorClientRegistry::GetInstance()->Register(this); 121 base::MemoryCoordinatorClientRegistry::GetInstance()->Register(this);
122 max_number_of_saved_frames_ = 122 max_number_of_saved_frames_ =
123 #if defined(OS_ANDROID) 123 #if defined(OS_ANDROID)
124 // If the amount of memory on the device is >= 3.5 GB, save up to 5 124 // If the amount of memory on the device is >= 3.5 GB, save up to 5
125 // frames. 125 // frames.
126 base::SysInfo::AmountOfPhysicalMemoryMB() < 1024 * 3.5f ? 1 : 5; 126 base::SysInfo::AmountOfPhysicalMemoryMB() < 1024 * 3.5f ? 1 : 5;
127 #else 127 #else
128 std::min(5, 2 + (base::SysInfo::AmountOfPhysicalMemoryMB() / 256)); 128 std::min(5, 2 + (base::SysInfo::AmountOfPhysicalMemoryMB() / 256));
129 #endif 129 #endif
130 max_handles_ = base::SharedMemory::GetHandleLimit() / 8.0f; 130 max_handles_ = base::SharedMemory::GetHandleLimit() / 8.0f;
131 } 131 }
132 132
133 RendererFrameManager::~RendererFrameManager() {} 133 RendererFrameManager::~RendererFrameManager() {}
134 134
135 void RendererFrameManager::CullUnlockedFrames(size_t saved_frame_limit) { 135 void RendererFrameManager::CullUnlockedFrames(size_t saved_frame_limit) {
136 if (unlocked_frames_.size() + locked_frames_.size() > 0) { 136 if (unlocked_frames_.size() + locked_frames_.size() > 0) {
137 float handles_per_frame = 137 float handles_per_frame =
138 display_compositor::HostSharedBitmapManager::current() 138 display_compositor::HostSharedBitmapManager::current()
139 ->AllocatedBitmapCount() * 139 ->AllocatedBitmapCount() *
140 1.0f / (unlocked_frames_.size() + locked_frames_.size()); 140 1.0f / (unlocked_frames_.size() + locked_frames_.size());
141 141
142 saved_frame_limit = std::max( 142 saved_frame_limit = std::max(
143 1, 143 1, static_cast<int>(std::min(static_cast<float>(saved_frame_limit),
144 static_cast<int>(std::min(static_cast<float>(saved_frame_limit), 144 max_handles_ / handles_per_frame)));
145 max_handles_ / handles_per_frame)));
146 } 145 }
147 while (!unlocked_frames_.empty() && 146 while (!unlocked_frames_.empty() &&
148 unlocked_frames_.size() + locked_frames_.size() > saved_frame_limit) { 147 unlocked_frames_.size() + locked_frames_.size() > saved_frame_limit) {
149 size_t old_size = unlocked_frames_.size(); 148 size_t old_size = unlocked_frames_.size();
150 // Should remove self from list. 149 // Should remove self from list.
151 unlocked_frames_.back()->EvictCurrentFrame(); 150 unlocked_frames_.back()->EvictCurrentFrame();
152 DCHECK_EQ(unlocked_frames_.size() + 1, old_size); 151 DCHECK_EQ(unlocked_frames_.size() + 1, old_size);
153 } 152 }
154 } 153 }
155 154
(...skipping 17 matching lines...) Expand all
173 } 172 }
174 173
175 void RendererFrameManager::PurgeMemory(int percentage) { 174 void RendererFrameManager::PurgeMemory(int percentage) {
176 int saved_frame_limit = max_number_of_saved_frames_; 175 int saved_frame_limit = max_number_of_saved_frames_;
177 if (saved_frame_limit <= 1) 176 if (saved_frame_limit <= 1)
178 return; 177 return;
179 CullUnlockedFrames(std::max(1, (saved_frame_limit * percentage) / 100)); 178 CullUnlockedFrames(std::max(1, (saved_frame_limit * percentage) / 100));
180 } 179 }
181 180
182 } // namespace content 181 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698