summaryrefslogtreecommitdiffstats
path: root/chromium/cc/tiles/tile_manager.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-05-17 17:24:03 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-06-22 07:51:41 +0000
commit774f54339e5db91f785733232d3950366db65d07 (patch)
tree068e1b47bd1af94d77094ed12b604a6b83d9c22a /chromium/cc/tiles/tile_manager.cc
parentf7eaed5286974984ba5f9e3189d8f49d03e99f81 (diff)
BASELINE: Update Chromium to 102.0.5005.57
Change-Id: I885f714bb40ee724c28f94ca6bd8dbdb39915158 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/cc/tiles/tile_manager.cc')
-rw-r--r--chromium/cc/tiles/tile_manager.cc26
1 files changed, 5 insertions, 21 deletions
diff --git a/chromium/cc/tiles/tile_manager.cc b/chromium/cc/tiles/tile_manager.cc
index a2b8e667b98..caf59cac516 100644
--- a/chromium/cc/tiles/tile_manager.cc
+++ b/chromium/cc/tiles/tile_manager.cc
@@ -16,7 +16,9 @@
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram.h"
+#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
+#include "base/synchronization/waitable_event.h"
#include "base/threading/thread_checker.h"
#include "base/trace_event/traced_value.h"
#include "cc/base/devtools_instrumentation.h"
@@ -560,10 +562,6 @@ bool TileManager::PrepareTiles(
return false;
}
- const bool did_memory_policy_become_more_restrictive =
- IsTileMemoryLimitPolicyMoreRestictive(state.memory_limit_policy,
- global_state_.memory_limit_policy);
-
signals_ = Signals();
global_state_ = state;
@@ -583,9 +581,6 @@ bool TileManager::PrepareTiles(
if (!ShouldRasterOccludedTiles())
FreeResourcesForOccludedTiles();
- if (did_memory_policy_become_more_restrictive)
- FreeResourcesForTilesThatViolateMemoryPolicy();
-
PrioritizedWorkToSchedule prioritized_work = AssignGpuMemoryToTiles();
// Inform the client that will likely require a draw if the highest priority
@@ -933,19 +928,6 @@ void TileManager::FreeResourcesForOccludedTiles() {
}
}
-void TileManager::FreeResourcesForTilesThatViolateMemoryPolicy() {
- std::unique_ptr<TilesWithResourceIterator> iterator =
- client_->CreateTilesWithResourceIterator();
- for (; !iterator->AtEnd(); iterator->Next()) {
- const PrioritizedTile* prioritized_tile =
- iterator->GetCurrentAsPrioritizedTile();
- DCHECK(prioritized_tile);
- Tile* tile = prioritized_tile->tile();
- if (TilePriorityViolatesMemoryPolicy(prioritized_tile->priority()))
- FreeResourcesForTileAndNotifyClientIfTileWasReadyToDraw(tile);
- }
-}
-
void TileManager::FreeResourcesForTile(Tile* tile) {
TileDrawInfo& draw_info = tile->draw_info();
@@ -1173,7 +1155,7 @@ void TileManager::ScheduleTasks(PrioritizedWorkToSchedule work_to_schedule) {
image_controller_.ReduceMemoryUsage();
// Insert nodes for our task completion tasks. We enqueue these using
- // NONCONCURRENT_FOREGROUND category this is the highest prioirty category and
+ // NONCONCURRENT_FOREGROUND category this is the highest priority category and
// we'd like to run these tasks as soon as possible.
InsertNodeForTask(&graph_, required_for_activation_done_task.get(),
TASK_CATEGORY_NONCONCURRENT_FOREGROUND,
@@ -1260,6 +1242,8 @@ scoped_refptr<TileTask> TileManager::CreateRasterTask(
prioritized_tile.priority().resolution == LOW_RESOLUTION;
playback_settings.use_lcd_text = tile->can_use_lcd_text();
playback_settings.msaa_sample_count = msaa_sample_count;
+ playback_settings.visible =
+ tile->required_for_activation() || tile->required_for_draw();
// Create and queue all image decode tasks that this tile depends on. Note
// that we need to store the images for decode tasks in