summaryrefslogtreecommitdiffstats
path: root/chromium/cc/tiles/tile_manager.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-03-12 09:13:00 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-03-16 09:58:26 +0000
commit03561cae90f1d99b5c54b1ef3be69f10e882b25e (patch)
treecc5f0958e823c044e7ae51cc0117fe51432abe5e /chromium/cc/tiles/tile_manager.cc
parentfa98118a45f7e169f8846086dc2c22c49a8ba310 (diff)
BASELINE: Update Chromium to 88.0.4324.208
Change-Id: I3ae87d23e4eff4b4a469685658740a213600c667 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.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chromium/cc/tiles/tile_manager.cc b/chromium/cc/tiles/tile_manager.cc
index 88dac92a4b7..c6c7cd5bd79 100644
--- a/chromium/cc/tiles/tile_manager.cc
+++ b/chromium/cc/tiles/tile_manager.cc
@@ -1424,8 +1424,6 @@ bool TileManager::AreRequiredTilesReadyToDraw(
// draw.
for (; !raster_priority_queue->IsEmpty(); raster_priority_queue->Pop()) {
const auto& prioritized_tile = raster_priority_queue->Top();
- // TODO(vmpstr): Check to debug crbug.com/622080. Remove when fixed.
- CHECK_EQ(prioritized_tile.priority().priority_bin, TilePriority::NOW);
if (!prioritized_tile.tile()->draw_info().IsReadyToDraw())
return false;
}
@@ -1498,7 +1496,7 @@ void TileManager::IssueSignals() {
if (signals_.activate_tile_tasks_completed &&
signals_.activate_gpu_work_completed &&
!signals_.did_notify_ready_to_activate) {
- if (IsReadyToActivate()) {
+ if (!client_->HasPendingTree() || IsReadyToActivate()) {
TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug"),
"TileManager::IssueSignals - ready to activate");
signals_.did_notify_ready_to_activate = true;