| Index: components/display_compositor/renderer_frame_manager.cc
|
| diff --git a/content/browser/renderer_host/renderer_frame_manager.cc b/components/display_compositor/renderer_frame_manager.cc
|
| similarity index 89%
|
| rename from content/browser/renderer_host/renderer_frame_manager.cc
|
| rename to components/display_compositor/renderer_frame_manager.cc
|
| index e8944e4371845e723a5236da79f614a15e64b095..dead0a695dc7fb12432c8f2fada707426435e1a1 100644
|
| --- a/content/browser/renderer_host/renderer_frame_manager.cc
|
| +++ b/components/display_compositor/renderer_frame_manager.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/browser/renderer_host/renderer_frame_manager.h"
|
| +#include "components/display_compositor/renderer_frame_manager.h"
|
|
|
| #include <algorithm>
|
|
|
| @@ -15,10 +15,10 @@
|
| #include "base/memory/shared_memory.h"
|
| #include "base/sys_info.h"
|
| #include "build/build_config.h"
|
| +#include "components/display_compositor/display_compositor_features.h"
|
| #include "components/display_compositor/host_shared_bitmap_manager.h"
|
| -#include "content/public/common/content_features.h"
|
|
|
| -namespace content {
|
| +namespace display_compositor {
|
| namespace {
|
|
|
| const int kModeratePressurePercentage = 50;
|
| @@ -50,7 +50,7 @@ void RendererFrameManager::RemoveFrame(RendererFrameManagerClient* frame) {
|
|
|
| void RendererFrameManager::LockFrame(RendererFrameManagerClient* frame) {
|
| std::list<RendererFrameManagerClient*>::iterator unlocked_iter =
|
| - std::find(unlocked_frames_.begin(), unlocked_frames_.end(), frame);
|
| + std::find(unlocked_frames_.begin(), unlocked_frames_.end(), frame);
|
| if (unlocked_iter != unlocked_frames_.end()) {
|
| DCHECK(locked_frames_.find(frame) == locked_frames_.end());
|
| unlocked_frames_.remove(frame);
|
| @@ -77,8 +77,8 @@ void RendererFrameManager::UnlockFrame(RendererFrameManagerClient* frame) {
|
| size_t RendererFrameManager::GetMaxNumberOfSavedFrames() const {
|
| int percentage = 100;
|
| if (base::FeatureList::IsEnabled(features::kMemoryCoordinator)) {
|
| - switch (base::MemoryCoordinatorProxy::GetInstance()->
|
| - GetCurrentMemoryState()) {
|
| + switch (
|
| + base::MemoryCoordinatorProxy::GetInstance()->GetCurrentMemoryState()) {
|
| case base::MemoryState::NORMAL:
|
| percentage = 100;
|
| break;
|
| @@ -115,9 +115,9 @@ size_t RendererFrameManager::GetMaxNumberOfSavedFrames() const {
|
| }
|
|
|
| RendererFrameManager::RendererFrameManager()
|
| - : memory_pressure_listener_(new base::MemoryPressureListener(
|
| - base::Bind(&RendererFrameManager::OnMemoryPressure,
|
| - base::Unretained(this)))) {
|
| + : memory_pressure_listener_(new base::MemoryPressureListener(
|
| + base::Bind(&RendererFrameManager::OnMemoryPressure,
|
| + base::Unretained(this)))) {
|
| base::MemoryCoordinatorClientRegistry::GetInstance()->Register(this);
|
| max_number_of_saved_frames_ =
|
| #if defined(OS_ANDROID)
|
| @@ -140,9 +140,8 @@ void RendererFrameManager::CullUnlockedFrames(size_t saved_frame_limit) {
|
| 1.0f / (unlocked_frames_.size() + locked_frames_.size());
|
|
|
| saved_frame_limit = std::max(
|
| - 1,
|
| - static_cast<int>(std::min(static_cast<float>(saved_frame_limit),
|
| - max_handles_ / handles_per_frame)));
|
| + 1, static_cast<int>(std::min(static_cast<float>(saved_frame_limit),
|
| + max_handles_ / handles_per_frame)));
|
| }
|
| while (!unlocked_frames_.empty() &&
|
| unlocked_frames_.size() + locked_frames_.size() > saved_frame_limit) {
|
|
|