OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "cc/resources/tile_manager.h" | 5 #include "cc/resources/tile_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <string> | 9 #include <string> |
10 | 10 |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/debug/trace_event_argument.h" | 12 #include "base/debug/trace_event_argument.h" |
13 #include "base/json/json_writer.h" | 13 #include "base/json/json_writer.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
15 #include "base/metrics/histogram.h" | 15 #include "base/metrics/histogram.h" |
16 #include "cc/debug/devtools_instrumentation.h" | 16 #include "cc/debug/devtools_instrumentation.h" |
17 #include "cc/debug/frame_viewer_instrumentation.h" | 17 #include "cc/debug/frame_viewer_instrumentation.h" |
18 #include "cc/debug/traced_value.h" | 18 #include "cc/debug/traced_value.h" |
19 #include "cc/layers/picture_layer_impl.h" | 19 #include "cc/layers/picture_layer_impl.h" |
20 #include "cc/resources/raster_buffer.h" | 20 #include "cc/resources/raster_buffer.h" |
| 21 #include "cc/resources/rasterizer.h" |
21 #include "cc/resources/tile.h" | 22 #include "cc/resources/tile.h" |
22 #include "cc/resources/tile_task_runner.h" | 23 #include "cc/resources/tile_task_runner.h" |
23 #include "ui/gfx/geometry/rect_conversions.h" | 24 #include "ui/gfx/geometry/rect_conversions.h" |
24 | 25 |
25 namespace cc { | 26 namespace cc { |
26 namespace { | 27 namespace { |
27 | 28 |
28 // Flag to indicate whether we should try and detect that | 29 // Flag to indicate whether we should try and detect that |
29 // a tile is of solid color. | 30 // a tile is of solid color. |
30 const bool kUseColorEstimator = true; | 31 const bool kUseColorEstimator = true; |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
194 state->SetInteger("canceled_count", stats.canceled_count); | 195 state->SetInteger("canceled_count", stats.canceled_count); |
195 return state; | 196 return state; |
196 } | 197 } |
197 | 198 |
198 // static | 199 // static |
199 scoped_ptr<TileManager> TileManager::Create( | 200 scoped_ptr<TileManager> TileManager::Create( |
200 TileManagerClient* client, | 201 TileManagerClient* client, |
201 base::SequencedTaskRunner* task_runner, | 202 base::SequencedTaskRunner* task_runner, |
202 ResourcePool* resource_pool, | 203 ResourcePool* resource_pool, |
203 TileTaskRunner* tile_task_runner, | 204 TileTaskRunner* tile_task_runner, |
| 205 Rasterizer* rasterizer, |
204 size_t scheduled_raster_task_limit) { | 206 size_t scheduled_raster_task_limit) { |
205 return make_scoped_ptr(new TileManager(client, task_runner, resource_pool, | 207 return make_scoped_ptr(new TileManager(client, task_runner, resource_pool, |
206 tile_task_runner, | 208 tile_task_runner, rasterizer, |
207 scheduled_raster_task_limit)); | 209 scheduled_raster_task_limit)); |
208 } | 210 } |
209 | 211 |
210 TileManager::TileManager( | 212 TileManager::TileManager( |
211 TileManagerClient* client, | 213 TileManagerClient* client, |
212 const scoped_refptr<base::SequencedTaskRunner>& task_runner, | 214 const scoped_refptr<base::SequencedTaskRunner>& task_runner, |
213 ResourcePool* resource_pool, | 215 ResourcePool* resource_pool, |
214 TileTaskRunner* tile_task_runner, | 216 TileTaskRunner* tile_task_runner, |
| 217 Rasterizer* rasterizer, |
215 size_t scheduled_raster_task_limit) | 218 size_t scheduled_raster_task_limit) |
216 : client_(client), | 219 : client_(client), |
217 task_runner_(task_runner), | 220 task_runner_(task_runner), |
218 resource_pool_(resource_pool), | 221 resource_pool_(resource_pool), |
219 tile_task_runner_(tile_task_runner), | 222 tile_task_runner_(tile_task_runner), |
| 223 rasterizer_(rasterizer), |
220 scheduled_raster_task_limit_(scheduled_raster_task_limit), | 224 scheduled_raster_task_limit_(scheduled_raster_task_limit), |
221 all_tiles_that_need_to_be_rasterized_are_scheduled_(true), | 225 all_tiles_that_need_to_be_rasterized_are_scheduled_(true), |
222 did_check_for_completed_tasks_since_last_schedule_tasks_(true), | 226 did_check_for_completed_tasks_since_last_schedule_tasks_(true), |
223 did_oom_on_last_assign_(false), | 227 did_oom_on_last_assign_(false), |
| 228 ready_to_activate_notifier_( |
| 229 task_runner_.get(), |
| 230 base::Bind(&TileManager::NotifyReadyToActivate, |
| 231 base::Unretained(this))), |
| 232 ready_to_draw_notifier_( |
| 233 task_runner_.get(), |
| 234 base::Bind(&TileManager::NotifyReadyToDraw, base::Unretained(this))), |
224 ready_to_activate_check_notifier_( | 235 ready_to_activate_check_notifier_( |
225 task_runner_.get(), | 236 task_runner_.get(), |
226 base::Bind(&TileManager::CheckIfReadyToActivate, | 237 base::Bind(&TileManager::CheckIfReadyToActivate, |
227 base::Unretained(this))), | 238 base::Unretained(this))), |
228 ready_to_draw_check_notifier_( | 239 ready_to_draw_check_notifier_( |
229 task_runner_.get(), | 240 task_runner_.get(), |
230 base::Bind(&TileManager::CheckIfReadyToDraw, base::Unretained(this))), | 241 base::Bind(&TileManager::CheckIfReadyToDraw, base::Unretained(this))), |
231 more_tiles_need_prepare_check_notifier_( | 242 more_tiles_need_prepare_check_notifier_( |
232 task_runner_.get(), | 243 task_runner_.get(), |
233 base::Bind(&TileManager::CheckIfMoreTilesNeedToBePrepared, | 244 base::Bind(&TileManager::CheckIfMoreTilesNeedToBePrepared, |
234 base::Unretained(this))), | 245 base::Unretained(this))), |
| 246 eviction_priority_queue_is_up_to_date_(false), |
235 did_notify_ready_to_activate_(false), | 247 did_notify_ready_to_activate_(false), |
236 did_notify_ready_to_draw_(false) { | 248 did_notify_ready_to_draw_(false) { |
237 tile_task_runner_->SetClient(this); | 249 tile_task_runner_->SetClient(this); |
238 } | 250 } |
239 | 251 |
240 TileManager::~TileManager() { | 252 TileManager::~TileManager() { |
241 // Reset global state and manage. This should cause | 253 // Reset global state and manage. This should cause |
242 // our memory usage to drop to zero. | 254 // our memory usage to drop to zero. |
243 global_state_ = GlobalStateThatImpactsTilePriority(); | 255 global_state_ = GlobalStateThatImpactsTilePriority(); |
244 | 256 |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
329 | 341 |
330 NOTREACHED(); | 342 NOTREACHED(); |
331 } | 343 } |
332 | 344 |
333 void TileManager::PrepareTiles( | 345 void TileManager::PrepareTiles( |
334 const GlobalStateThatImpactsTilePriority& state) { | 346 const GlobalStateThatImpactsTilePriority& state) { |
335 TRACE_EVENT0("cc", "TileManager::PrepareTiles"); | 347 TRACE_EVENT0("cc", "TileManager::PrepareTiles"); |
336 | 348 |
337 global_state_ = state; | 349 global_state_ = state; |
338 | 350 |
339 // We need to call CheckForCompletedTasks() once in-between each call | 351 PrepareTilesMode prepare_tiles_mode = rasterizer_->GetPrepareTilesMode(); |
340 // to ScheduleTasks() to prevent canceled tasks from being scheduled. | 352 |
341 if (!did_check_for_completed_tasks_since_last_schedule_tasks_) { | 353 // TODO(hendrikw): Consider moving some of this code to the rasterizer. |
342 tile_task_runner_->CheckForCompletedTasks(); | 354 if (prepare_tiles_mode != PrepareTilesMode::PREPARE_NONE) { |
343 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; | 355 // We need to call CheckForCompletedTasks() once in-between each call |
| 356 // to ScheduleTasks() to prevent canceled tasks from being scheduled. |
| 357 if (!did_check_for_completed_tasks_since_last_schedule_tasks_) { |
| 358 tile_task_runner_->CheckForCompletedTasks(); |
| 359 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; |
| 360 } |
| 361 |
| 362 FreeResourcesForReleasedTiles(); |
| 363 CleanUpReleasedTiles(); |
| 364 |
| 365 TileVector tiles_that_need_to_be_rasterized; |
| 366 AssignGpuMemoryToTiles(&tiles_that_need_to_be_rasterized, |
| 367 scheduled_raster_task_limit_, false); |
| 368 |
| 369 // Schedule tile tasks. |
| 370 ScheduleTasks(tiles_that_need_to_be_rasterized); |
| 371 |
| 372 did_notify_ready_to_activate_ = false; |
| 373 did_notify_ready_to_draw_ = false; |
| 374 } else { |
| 375 if (global_state_.hard_memory_limit_in_bytes == 0) { |
| 376 TileVector tiles_that_need_to_be_rasterized; |
| 377 AssignGpuMemoryToTiles(&tiles_that_need_to_be_rasterized, |
| 378 scheduled_raster_task_limit_, false); |
| 379 DCHECK(tiles_that_need_to_be_rasterized.empty()); |
| 380 } |
| 381 |
| 382 did_notify_ready_to_activate_ = false; |
| 383 did_notify_ready_to_draw_ = false; |
| 384 ready_to_activate_notifier_.Schedule(); |
| 385 ready_to_draw_notifier_.Schedule(); |
344 } | 386 } |
345 | 387 |
| 388 TRACE_EVENT_INSTANT1("cc", "DidPrepareTiles", TRACE_EVENT_SCOPE_THREAD, |
| 389 "state", BasicStateAsValue()); |
| 390 |
| 391 TRACE_COUNTER_ID1("cc", "unused_memory_bytes", this, |
| 392 resource_pool_->total_memory_usage_bytes() - |
| 393 resource_pool_->acquired_memory_usage_bytes()); |
| 394 } |
| 395 |
| 396 void TileManager::SynchronouslyRasterizeTiles( |
| 397 const GlobalStateThatImpactsTilePriority& state) { |
| 398 TRACE_EVENT0("cc", "TileManager::SynchronouslyRasterizeTiles"); |
| 399 |
| 400 DCHECK(rasterizer_->GetPrepareTilesMode() != |
| 401 PrepareTilesMode::RASTERIZE_PRIORITIZED_TILES); |
| 402 |
| 403 global_state_ = state; |
| 404 |
346 FreeResourcesForReleasedTiles(); | 405 FreeResourcesForReleasedTiles(); |
347 CleanUpReleasedTiles(); | 406 CleanUpReleasedTiles(); |
348 | 407 |
349 TileVector tiles_that_need_to_be_rasterized; | 408 TileVector tiles_that_need_to_be_rasterized; |
350 AssignGpuMemoryToTiles(&tiles_that_need_to_be_rasterized); | 409 AssignGpuMemoryToTiles(&tiles_that_need_to_be_rasterized, |
| 410 std::numeric_limits<size_t>::max(), true); |
351 | 411 |
352 // Schedule tile tasks. | 412 // We must reduce the amount of unused resources before calling |
353 ScheduleTasks(tiles_that_need_to_be_rasterized); | 413 // RunTasks to prevent usage from rising above limits. |
| 414 resource_pool_->ReduceResourceUsage(); |
354 | 415 |
355 did_notify_ready_to_activate_ = false; | 416 // Run and complete all raster task synchronously. |
356 did_notify_ready_to_draw_ = false; | 417 rasterizer_->RasterizeTiles( |
| 418 tiles_that_need_to_be_rasterized, resource_pool_, |
| 419 base::Bind(&TileManager::UpdateTileDrawInfo, base::Unretained(this))); |
357 | 420 |
358 TRACE_EVENT_INSTANT1("cc", "DidPrepare", TRACE_EVENT_SCOPE_THREAD, "state", | 421 // Use on-demand raster for any required-for-activation tiles that have not |
| 422 // been been assigned memory after reaching a steady memory state. This |
| 423 // ensures that we activate even when OOM. Note that we have to rebuilt the |
| 424 // queue in case the last AssignGpuMemoryToTiles evicted some tiles that would |
| 425 // otherwise not be picked up by the old raster queue. |
| 426 client_->BuildRasterQueue(&raster_priority_queue_, |
| 427 global_state_.tree_priority); |
| 428 |
| 429 // Use on-demand raster for any tiles that have not been been assigned |
| 430 // memory. This ensures that we draw even when OOM. |
| 431 while (!raster_priority_queue_.IsEmpty()) { |
| 432 Tile* tile = raster_priority_queue_.Top(); |
| 433 TileDrawInfo& draw_info = tile->draw_info(); |
| 434 |
| 435 if (tile->required_for_draw() && !draw_info.IsReadyToDraw()) { |
| 436 draw_info.set_rasterize_on_demand(); |
| 437 client_->NotifyTileStateChanged(tile); |
| 438 } |
| 439 raster_priority_queue_.Pop(); |
| 440 } |
| 441 raster_priority_queue_.Reset(); |
| 442 |
| 443 TRACE_EVENT_INSTANT1("cc", "DidRasterize", TRACE_EVENT_SCOPE_THREAD, "state", |
359 BasicStateAsValue()); | 444 BasicStateAsValue()); |
360 | 445 |
361 TRACE_COUNTER_ID1("cc", | 446 TRACE_COUNTER_ID1("cc", "unused_memory_bytes", this, |
362 "unused_memory_bytes", | |
363 this, | |
364 resource_pool_->total_memory_usage_bytes() - | 447 resource_pool_->total_memory_usage_bytes() - |
365 resource_pool_->acquired_memory_usage_bytes()); | 448 resource_pool_->acquired_memory_usage_bytes()); |
366 } | 449 } |
367 | 450 |
368 void TileManager::UpdateVisibleTiles() { | 451 void TileManager::UpdateVisibleTiles( |
| 452 const GlobalStateThatImpactsTilePriority& state) { |
369 TRACE_EVENT0("cc", "TileManager::UpdateVisibleTiles"); | 453 TRACE_EVENT0("cc", "TileManager::UpdateVisibleTiles"); |
370 | 454 |
371 tile_task_runner_->CheckForCompletedTasks(); | 455 tile_task_runner_->CheckForCompletedTasks(); |
| 456 |
| 457 DCHECK(rasterizer_); |
| 458 PrepareTilesMode prepare_tiles_mode = rasterizer_->GetPrepareTilesMode(); |
| 459 if (prepare_tiles_mode != PrepareTilesMode::RASTERIZE_PRIORITIZED_TILES) |
| 460 SynchronouslyRasterizeTiles(state); |
| 461 |
372 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; | 462 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; |
373 | 463 |
374 TRACE_EVENT_INSTANT1( | 464 TRACE_EVENT_INSTANT1( |
375 "cc", | 465 "cc", |
376 "DidUpdateVisibleTiles", | 466 "DidUpdateVisibleTiles", |
377 TRACE_EVENT_SCOPE_THREAD, | 467 TRACE_EVENT_SCOPE_THREAD, |
378 "stats", | 468 "stats", |
379 RasterTaskCompletionStatsAsValue(update_visible_tiles_stats_)); | 469 RasterTaskCompletionStatsAsValue(update_visible_tiles_stats_)); |
380 update_visible_tiles_stats_ = RasterTaskCompletionStats(); | 470 update_visible_tiles_stats_ = RasterTaskCompletionStats(); |
381 } | 471 } |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
457 return priority.priority_bin > TilePriority::SOON; | 547 return priority.priority_bin > TilePriority::SOON; |
458 case ALLOW_ANYTHING: | 548 case ALLOW_ANYTHING: |
459 return priority.distance_to_visible == | 549 return priority.distance_to_visible == |
460 std::numeric_limits<float>::infinity(); | 550 std::numeric_limits<float>::infinity(); |
461 } | 551 } |
462 NOTREACHED(); | 552 NOTREACHED(); |
463 return true; | 553 return true; |
464 } | 554 } |
465 | 555 |
466 void TileManager::AssignGpuMemoryToTiles( | 556 void TileManager::AssignGpuMemoryToTiles( |
467 TileVector* tiles_that_need_to_be_rasterized) { | 557 TileVector* tiles_that_need_to_be_rasterized, |
| 558 size_t scheduled_raster_task_limit, |
| 559 bool required_for_draw_only) { |
468 TRACE_EVENT_BEGIN0("cc", "TileManager::AssignGpuMemoryToTiles"); | 560 TRACE_EVENT_BEGIN0("cc", "TileManager::AssignGpuMemoryToTiles"); |
469 | 561 |
470 // Maintain the list of released resources that can potentially be re-used | 562 // Maintain the list of released resources that can potentially be re-used |
471 // or deleted. | 563 // or deleted. |
472 // If this operation becomes expensive too, only do this after some | 564 // If this operation becomes expensive too, only do this after some |
473 // resource(s) was returned. Note that in that case, one also need to | 565 // resource(s) was returned. Note that in that case, one also need to |
474 // invalidate when releasing some resource from the pool. | 566 // invalidate when releasing some resource from the pool. |
475 resource_pool_->CheckBusyResources(false); | 567 resource_pool_->CheckBusyResources(false); |
476 | 568 |
477 // Now give memory out to the tiles until we're out, and build | 569 // Now give memory out to the tiles until we're out, and build |
478 // the needs-to-be-rasterized queue. | 570 // the needs-to-be-rasterized queue. |
479 unsigned schedule_priority = 1u; | 571 unsigned schedule_priority = 1u; |
480 all_tiles_that_need_to_be_rasterized_are_scheduled_ = true; | 572 all_tiles_that_need_to_be_rasterized_are_scheduled_ = true; |
481 bool had_enough_memory_to_schedule_tiles_needed_now = true; | 573 bool had_enough_memory_to_schedule_tiles_needed_now = true; |
482 | 574 |
483 MemoryUsage hard_memory_limit(global_state_.hard_memory_limit_in_bytes, | 575 MemoryUsage hard_memory_limit(global_state_.hard_memory_limit_in_bytes, |
484 global_state_.num_resources_limit); | 576 global_state_.num_resources_limit); |
485 MemoryUsage soft_memory_limit(global_state_.soft_memory_limit_in_bytes, | 577 MemoryUsage soft_memory_limit(global_state_.soft_memory_limit_in_bytes, |
486 global_state_.num_resources_limit); | 578 global_state_.num_resources_limit); |
487 MemoryUsage memory_usage(resource_pool_->acquired_memory_usage_bytes(), | 579 MemoryUsage memory_usage(resource_pool_->acquired_memory_usage_bytes(), |
488 resource_pool_->acquired_resource_count()); | 580 resource_pool_->acquired_resource_count()); |
489 | 581 |
490 eviction_priority_queue_is_up_to_date_ = false; | 582 eviction_priority_queue_is_up_to_date_ = false; |
491 client_->BuildRasterQueue(&raster_priority_queue_, | 583 client_->BuildRasterQueue(&raster_priority_queue_, |
492 global_state_.tree_priority); | 584 global_state_.tree_priority); |
493 | 585 |
494 while (!raster_priority_queue_.IsEmpty()) { | 586 while (!raster_priority_queue_.IsEmpty()) { |
495 Tile* tile = raster_priority_queue_.Top(); | 587 Tile* tile = raster_priority_queue_.Top(); |
| 588 |
| 589 // TODO(vmpstr): Remove this when the iterator returns the correct tiles |
| 590 // to draw for GPU rasterization. |
| 591 if (required_for_draw_only) { |
| 592 if (!tile->required_for_draw()) { |
| 593 raster_priority_queue_.Pop(); |
| 594 continue; |
| 595 } |
| 596 } |
496 TilePriority priority = tile->combined_priority(); | 597 TilePriority priority = tile->combined_priority(); |
497 | 598 |
498 if (TilePriorityViolatesMemoryPolicy(priority)) { | 599 if (TilePriorityViolatesMemoryPolicy(priority)) { |
499 TRACE_EVENT_INSTANT0( | 600 TRACE_EVENT_INSTANT0( |
500 "cc", | 601 "cc", "TileManager::AssignGpuMemory tile violates memory policy", |
501 "TileManager::AssignGpuMemory tile violates memory policy", | |
502 TRACE_EVENT_SCOPE_THREAD); | 602 TRACE_EVENT_SCOPE_THREAD); |
503 break; | 603 break; |
504 } | 604 } |
505 | 605 |
506 // We won't be able to schedule this tile, so break out early. | 606 // We won't be able to schedule this tile, so break out early. |
507 if (tiles_that_need_to_be_rasterized->size() >= | 607 if (tiles_that_need_to_be_rasterized->size() >= |
508 scheduled_raster_task_limit_) { | 608 scheduled_raster_task_limit) { |
509 all_tiles_that_need_to_be_rasterized_are_scheduled_ = false; | 609 all_tiles_that_need_to_be_rasterized_are_scheduled_ = false; |
510 break; | 610 break; |
511 } | 611 } |
512 | 612 |
513 TileDrawInfo& draw_info = tile->draw_info(); | 613 TileDrawInfo& draw_info = tile->draw_info(); |
514 tile->scheduled_priority_ = schedule_priority++; | 614 tile->scheduled_priority_ = schedule_priority++; |
515 | 615 |
516 DCHECK(draw_info.mode() == TileDrawInfo::PICTURE_PILE_MODE || | 616 DCHECK(draw_info.mode() == TileDrawInfo::PICTURE_PILE_MODE || |
517 !draw_info.IsReadyToDraw()); | 617 !draw_info.IsReadyToDraw()); |
518 | 618 |
519 // If the tile already has a raster_task, then the memory used by it is | 619 // If the tile already has a raster_task, then the memory used by it is |
520 // already accounted for in memory_usage. Otherwise, we'll have to acquire | 620 // already accounted for in memory_usage. Otherwise, we'll have to acquire |
521 // more memory to create a raster task. | 621 // more memory to create a raster task. |
522 MemoryUsage memory_required_by_tile_to_be_scheduled; | 622 MemoryUsage memory_required_by_tile_to_be_scheduled; |
523 if (!tile->raster_task_.get()) { | 623 if (!tile->raster_task_.get()) { |
524 memory_required_by_tile_to_be_scheduled = MemoryUsage::FromConfig( | 624 memory_required_by_tile_to_be_scheduled = MemoryUsage::FromConfig( |
525 tile->size(), resource_pool_->resource_format()); | 625 tile->desired_texture_size(), resource_pool_->resource_format()); |
526 } | 626 } |
527 | 627 |
528 bool tile_is_needed_now = priority.priority_bin == TilePriority::NOW; | 628 bool tile_is_needed_now = priority.priority_bin == TilePriority::NOW; |
529 | 629 |
530 // This is the memory limit that will be used by this tile. Depending on | 630 // This is the memory limit that will be used by this tile. Depending on |
531 // the tile priority, it will be one of hard_memory_limit or | 631 // the tile priority, it will be one of hard_memory_limit or |
532 // soft_memory_limit. | 632 // soft_memory_limit. |
533 MemoryUsage& tile_memory_limit = | 633 MemoryUsage& tile_memory_limit = |
534 tile_is_needed_now ? hard_memory_limit : soft_memory_limit; | 634 tile_is_needed_now ? hard_memory_limit : soft_memory_limit; |
535 | 635 |
536 bool memory_usage_is_within_limit = | 636 bool memory_usage_is_within_limit = |
537 FreeTileResourcesWithLowerPriorityUntilUsageIsWithinLimit( | 637 FreeTileResourcesWithLowerPriorityUntilUsageIsWithinLimit( |
538 tile_memory_limit - memory_required_by_tile_to_be_scheduled, | 638 tile_memory_limit - memory_required_by_tile_to_be_scheduled, |
539 priority, | 639 priority, &memory_usage); |
540 &memory_usage); | |
541 | 640 |
542 // If we couldn't fit the tile into our current memory limit, then we're | 641 // If we couldn't fit the tile into our current memory limit, then we're |
543 // done. | 642 // done. |
544 if (!memory_usage_is_within_limit) { | 643 if (!memory_usage_is_within_limit) { |
545 if (tile_is_needed_now) | 644 if (tile_is_needed_now) |
546 had_enough_memory_to_schedule_tiles_needed_now = false; | 645 had_enough_memory_to_schedule_tiles_needed_now = false; |
547 all_tiles_that_need_to_be_rasterized_are_scheduled_ = false; | 646 all_tiles_that_need_to_be_rasterized_are_scheduled_ = false; |
548 break; | 647 break; |
549 } | 648 } |
550 | 649 |
(...skipping 12 matching lines...) Expand all Loading... |
563 did_oom_on_last_assign_ = !had_enough_memory_to_schedule_tiles_needed_now; | 662 did_oom_on_last_assign_ = !had_enough_memory_to_schedule_tiles_needed_now; |
564 | 663 |
565 memory_stats_from_last_assign_.total_budget_in_bytes = | 664 memory_stats_from_last_assign_.total_budget_in_bytes = |
566 global_state_.hard_memory_limit_in_bytes; | 665 global_state_.hard_memory_limit_in_bytes; |
567 memory_stats_from_last_assign_.total_bytes_used = memory_usage.memory_bytes(); | 666 memory_stats_from_last_assign_.total_bytes_used = memory_usage.memory_bytes(); |
568 memory_stats_from_last_assign_.had_enough_memory = | 667 memory_stats_from_last_assign_.had_enough_memory = |
569 had_enough_memory_to_schedule_tiles_needed_now; | 668 had_enough_memory_to_schedule_tiles_needed_now; |
570 | 669 |
571 raster_priority_queue_.Reset(); | 670 raster_priority_queue_.Reset(); |
572 | 671 |
573 TRACE_EVENT_END2("cc", | 672 TRACE_EVENT_END2("cc", "TileManager::AssignGpuMemoryToTiles", |
574 "TileManager::AssignGpuMemoryToTiles", | |
575 "all_tiles_that_need_to_be_rasterized_are_scheduled", | 673 "all_tiles_that_need_to_be_rasterized_are_scheduled", |
576 all_tiles_that_need_to_be_rasterized_are_scheduled_, | 674 all_tiles_that_need_to_be_rasterized_are_scheduled_, |
577 "had_enough_memory_to_schedule_tiles_needed_now", | 675 "had_enough_memory_to_schedule_tiles_needed_now", |
578 had_enough_memory_to_schedule_tiles_needed_now); | 676 had_enough_memory_to_schedule_tiles_needed_now); |
579 } | 677 } |
580 | 678 |
581 void TileManager::FreeResourcesForTile(Tile* tile) { | 679 void TileManager::FreeResourcesForTile(Tile* tile) { |
582 TileDrawInfo& draw_info = tile->draw_info(); | 680 TileDrawInfo& draw_info = tile->draw_info(); |
583 if (draw_info.resource_) | 681 if (draw_info.resource_) |
584 resource_pool_->ReleaseResource(draw_info.resource_.Pass()); | 682 resource_pool_->ReleaseResource(draw_info.resource_.Pass()); |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
651 pixel_ref, | 749 pixel_ref, |
652 tile->layer_id(), | 750 tile->layer_id(), |
653 base::Bind(&TileManager::OnImageDecodeTaskCompleted, | 751 base::Bind(&TileManager::OnImageDecodeTaskCompleted, |
654 base::Unretained(this), | 752 base::Unretained(this), |
655 tile->layer_id(), | 753 tile->layer_id(), |
656 base::Unretained(pixel_ref)))); | 754 base::Unretained(pixel_ref)))); |
657 } | 755 } |
658 | 756 |
659 scoped_refptr<RasterTask> TileManager::CreateRasterTask(Tile* tile) { | 757 scoped_refptr<RasterTask> TileManager::CreateRasterTask(Tile* tile) { |
660 scoped_ptr<ScopedResource> resource = | 758 scoped_ptr<ScopedResource> resource = |
661 resource_pool_->AcquireResource(tile->size()); | 759 resource_pool_->AcquireResource(tile->desired_texture_size()); |
662 const ScopedResource* const_resource = resource.get(); | 760 const ScopedResource* const_resource = resource.get(); |
663 | 761 |
664 // Create and queue all image decode tasks that this tile depends on. | 762 // Create and queue all image decode tasks that this tile depends on. |
665 ImageDecodeTask::Vector decode_tasks; | 763 ImageDecodeTask::Vector decode_tasks; |
666 PixelRefTaskMap& existing_pixel_refs = image_decode_tasks_[tile->layer_id()]; | 764 PixelRefTaskMap& existing_pixel_refs = image_decode_tasks_[tile->layer_id()]; |
667 std::vector<SkPixelRef*> pixel_refs; | 765 std::vector<SkPixelRef*> pixel_refs; |
668 tile->raster_source()->GatherPixelRefs( | 766 tile->raster_source()->GatherPixelRefs( |
669 tile->content_rect(), tile->contents_scale(), &pixel_refs); | 767 tile->content_rect(), tile->contents_scale(), &pixel_refs); |
670 for (SkPixelRef* pixel_ref : pixel_refs) { | 768 for (SkPixelRef* pixel_ref : pixel_refs) { |
671 uint32_t id = pixel_ref->getGenerationID(); | 769 uint32_t id = pixel_ref->getGenerationID(); |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
715 } | 813 } |
716 | 814 |
717 void TileManager::OnRasterTaskCompleted( | 815 void TileManager::OnRasterTaskCompleted( |
718 Tile::Id tile_id, | 816 Tile::Id tile_id, |
719 scoped_ptr<ScopedResource> resource, | 817 scoped_ptr<ScopedResource> resource, |
720 const RasterSource::SolidColorAnalysis& analysis, | 818 const RasterSource::SolidColorAnalysis& analysis, |
721 bool was_canceled) { | 819 bool was_canceled) { |
722 DCHECK(tiles_.find(tile_id) != tiles_.end()); | 820 DCHECK(tiles_.find(tile_id) != tiles_.end()); |
723 | 821 |
724 Tile* tile = tiles_[tile_id]; | 822 Tile* tile = tiles_[tile_id]; |
725 TileDrawInfo& draw_info = tile->draw_info(); | |
726 DCHECK(tile->raster_task_.get()); | 823 DCHECK(tile->raster_task_.get()); |
727 orphan_raster_tasks_.push_back(tile->raster_task_); | 824 orphan_raster_tasks_.push_back(tile->raster_task_); |
728 tile->raster_task_ = NULL; | 825 tile->raster_task_ = nullptr; |
729 | 826 |
730 if (was_canceled) { | 827 if (was_canceled) { |
731 ++update_visible_tiles_stats_.canceled_count; | 828 ++update_visible_tiles_stats_.canceled_count; |
732 resource_pool_->ReleaseResource(resource.Pass()); | 829 resource_pool_->ReleaseResource(resource.Pass()); |
733 return; | 830 return; |
734 } | 831 } |
735 | 832 |
| 833 UpdateTileDrawInfo(tile, resource.Pass(), analysis); |
| 834 } |
| 835 |
| 836 void TileManager::UpdateTileDrawInfo( |
| 837 Tile* tile, |
| 838 scoped_ptr<ScopedResource> resource, |
| 839 const RasterSource::SolidColorAnalysis& analysis) { |
| 840 TileDrawInfo& draw_info = tile->draw_info(); |
| 841 |
736 ++update_visible_tiles_stats_.completed_count; | 842 ++update_visible_tiles_stats_.completed_count; |
737 | 843 |
738 if (analysis.is_solid_color) { | 844 if (analysis.is_solid_color) { |
739 draw_info.set_solid_color(analysis.solid_color); | 845 draw_info.set_solid_color(analysis.solid_color); |
740 resource_pool_->ReleaseResource(resource.Pass()); | 846 resource_pool_->ReleaseResource(resource.Pass()); |
741 } else { | 847 } else { |
742 draw_info.set_use_resource(); | 848 draw_info.set_use_resource(); |
743 draw_info.resource_ = resource.Pass(); | 849 draw_info.resource_ = resource.Pass(); |
744 } | 850 } |
745 | 851 |
746 client_->NotifyTileStateChanged(tile); | 852 client_->NotifyTileStateChanged(tile); |
747 } | 853 } |
748 | 854 |
749 scoped_refptr<Tile> TileManager::CreateTile(RasterSource* raster_source, | 855 scoped_refptr<Tile> TileManager::CreateTile( |
750 const gfx::Size& tile_size, | 856 RasterSource* raster_source, |
751 const gfx::Rect& content_rect, | 857 const gfx::Size& desired_texture_size, |
752 float contents_scale, | 858 const gfx::Rect& content_rect, |
753 int layer_id, | 859 float contents_scale, |
754 int source_frame_number, | 860 int layer_id, |
755 int flags) { | 861 int source_frame_number, |
756 scoped_refptr<Tile> tile = make_scoped_refptr(new Tile(this, | 862 int flags) { |
757 raster_source, | 863 scoped_refptr<Tile> tile = make_scoped_refptr( |
758 tile_size, | 864 new Tile(this, raster_source, desired_texture_size, content_rect, |
759 content_rect, | 865 contents_scale, layer_id, source_frame_number, flags)); |
760 contents_scale, | |
761 layer_id, | |
762 source_frame_number, | |
763 flags)); | |
764 DCHECK(tiles_.find(tile->id()) == tiles_.end()); | 866 DCHECK(tiles_.find(tile->id()) == tiles_.end()); |
765 | 867 |
766 tiles_[tile->id()] = tile.get(); | 868 tiles_[tile->id()] = tile.get(); |
767 used_layer_counts_[tile->layer_id()]++; | 869 used_layer_counts_[tile->layer_id()]++; |
768 return tile; | 870 return tile; |
769 } | 871 } |
770 | 872 |
771 void TileManager::SetTileTaskRunnerForTesting( | 873 void TileManager::SetTileTaskRunnerForTesting( |
772 TileTaskRunner* tile_task_runner) { | 874 TileTaskRunner* tile_task_runner) { |
773 tile_task_runner_ = tile_task_runner; | 875 tile_task_runner_ = tile_task_runner; |
(...skipping 16 matching lines...) Expand all Loading... |
790 const std::vector<PictureLayerImpl*>& layers = client_->GetPictureLayers(); | 892 const std::vector<PictureLayerImpl*>& layers = client_->GetPictureLayers(); |
791 | 893 |
792 for (const auto& layer : layers) { | 894 for (const auto& layer : layers) { |
793 if (!layer->AllTilesRequiredForDrawAreReadyToDraw()) | 895 if (!layer->AllTilesRequiredForDrawAreReadyToDraw()) |
794 return false; | 896 return false; |
795 } | 897 } |
796 | 898 |
797 return true; | 899 return true; |
798 } | 900 } |
799 | 901 |
| 902 void TileManager::NotifyReadyToActivate() { |
| 903 TRACE_EVENT0("cc", "TileManager::NotifyReadyToActivate"); |
| 904 if (did_notify_ready_to_activate_) |
| 905 return; |
| 906 client_->NotifyReadyToActivate(); |
| 907 did_notify_ready_to_activate_ = true; |
| 908 } |
| 909 |
| 910 void TileManager::NotifyReadyToDraw() { |
| 911 TRACE_EVENT0("cc", "TileManager::NotifyReadyToDraw"); |
| 912 if (did_notify_ready_to_draw_) |
| 913 return; |
| 914 client_->NotifyReadyToDraw(); |
| 915 did_notify_ready_to_draw_ = true; |
| 916 } |
| 917 |
800 void TileManager::CheckIfReadyToActivate() { | 918 void TileManager::CheckIfReadyToActivate() { |
801 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToActivate"); | 919 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToActivate"); |
802 | 920 |
803 tile_task_runner_->CheckForCompletedTasks(); | 921 tile_task_runner_->CheckForCompletedTasks(); |
804 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; | 922 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; |
805 | 923 |
806 if (did_notify_ready_to_activate_) | 924 if (did_notify_ready_to_activate_) |
807 return; | 925 return; |
808 if (!IsReadyToActivate()) | 926 if (!IsReadyToActivate()) |
809 return; | 927 return; |
810 | 928 |
811 client_->NotifyReadyToActivate(); | 929 NotifyReadyToActivate(); |
812 did_notify_ready_to_activate_ = true; | |
813 } | 930 } |
814 | 931 |
815 void TileManager::CheckIfReadyToDraw() { | 932 void TileManager::CheckIfReadyToDraw() { |
816 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToDraw"); | 933 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToDraw"); |
817 | 934 |
818 tile_task_runner_->CheckForCompletedTasks(); | 935 tile_task_runner_->CheckForCompletedTasks(); |
819 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; | 936 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; |
820 | 937 |
821 if (did_notify_ready_to_draw_) | 938 if (did_notify_ready_to_draw_) |
822 return; | 939 return; |
823 if (!IsReadyToDraw()) | 940 if (!IsReadyToDraw()) |
824 return; | 941 return; |
825 | 942 |
826 client_->NotifyReadyToDraw(); | 943 NotifyReadyToDraw(); |
827 did_notify_ready_to_draw_ = true; | |
828 } | 944 } |
829 | 945 |
830 void TileManager::CheckIfMoreTilesNeedToBePrepared() { | 946 void TileManager::CheckIfMoreTilesNeedToBePrepared() { |
831 tile_task_runner_->CheckForCompletedTasks(); | 947 tile_task_runner_->CheckForCompletedTasks(); |
832 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; | 948 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; |
833 | 949 |
834 // When OOM, keep re-assigning memory until we reach a steady state | 950 // When OOM, keep re-assigning memory until we reach a steady state |
835 // where top-priority tiles are initialized. | 951 // where top-priority tiles are initialized. |
836 TileVector tiles_that_need_to_be_rasterized; | 952 TileVector tiles_that_need_to_be_rasterized; |
837 AssignGpuMemoryToTiles(&tiles_that_need_to_be_rasterized); | 953 AssignGpuMemoryToTiles(&tiles_that_need_to_be_rasterized, |
| 954 scheduled_raster_task_limit_, false); |
838 | 955 |
839 // |tiles_that_need_to_be_rasterized| will be empty when we reach a | 956 // |tiles_that_need_to_be_rasterized| will be empty when we reach a |
840 // steady memory state. Keep scheduling tasks until we reach this state. | 957 // steady memory state. Keep scheduling tasks until we reach this state. |
841 if (!tiles_that_need_to_be_rasterized.empty()) { | 958 if (!tiles_that_need_to_be_rasterized.empty()) { |
842 ScheduleTasks(tiles_that_need_to_be_rasterized); | 959 ScheduleTasks(tiles_that_need_to_be_rasterized); |
843 return; | 960 return; |
844 } | 961 } |
845 | 962 |
846 FreeResourcesForReleasedTiles(); | 963 FreeResourcesForReleasedTiles(); |
847 | 964 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
900 TileManager::MemoryUsage TileManager::MemoryUsage::FromConfig( | 1017 TileManager::MemoryUsage TileManager::MemoryUsage::FromConfig( |
901 const gfx::Size& size, | 1018 const gfx::Size& size, |
902 ResourceFormat format) { | 1019 ResourceFormat format) { |
903 return MemoryUsage(Resource::MemorySizeBytes(size, format), 1); | 1020 return MemoryUsage(Resource::MemorySizeBytes(size, format), 1); |
904 } | 1021 } |
905 | 1022 |
906 // static | 1023 // static |
907 TileManager::MemoryUsage TileManager::MemoryUsage::FromTile(const Tile* tile) { | 1024 TileManager::MemoryUsage TileManager::MemoryUsage::FromTile(const Tile* tile) { |
908 const TileDrawInfo& draw_info = tile->draw_info(); | 1025 const TileDrawInfo& draw_info = tile->draw_info(); |
909 if (draw_info.resource_) { | 1026 if (draw_info.resource_) { |
910 return MemoryUsage::FromConfig(tile->size(), draw_info.resource_->format()); | 1027 return MemoryUsage::FromConfig(draw_info.resource_->size(), |
| 1028 draw_info.resource_->format()); |
911 } | 1029 } |
912 return MemoryUsage(); | 1030 return MemoryUsage(); |
913 } | 1031 } |
914 | 1032 |
915 TileManager::MemoryUsage& TileManager::MemoryUsage::operator+=( | 1033 TileManager::MemoryUsage& TileManager::MemoryUsage::operator+=( |
916 const MemoryUsage& other) { | 1034 const MemoryUsage& other) { |
917 memory_bytes_ += other.memory_bytes_; | 1035 memory_bytes_ += other.memory_bytes_; |
918 resource_count_ += other.resource_count_; | 1036 resource_count_ += other.resource_count_; |
919 return *this; | 1037 return *this; |
920 } | 1038 } |
(...skipping 11 matching lines...) Expand all Loading... |
932 result -= other; | 1050 result -= other; |
933 return result; | 1051 return result; |
934 } | 1052 } |
935 | 1053 |
936 bool TileManager::MemoryUsage::Exceeds(const MemoryUsage& limit) const { | 1054 bool TileManager::MemoryUsage::Exceeds(const MemoryUsage& limit) const { |
937 return memory_bytes_ > limit.memory_bytes_ || | 1055 return memory_bytes_ > limit.memory_bytes_ || |
938 resource_count_ > limit.resource_count_; | 1056 resource_count_ > limit.resource_count_; |
939 } | 1057 } |
940 | 1058 |
941 } // namespace cc | 1059 } // namespace cc |
OLD | NEW |