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

Side by Side Diff: cc/resources/tile_manager.cc

Issue 246673005: cc: Start using raster/eviction iterators in tile manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
OLDNEW
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
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 skia::RefPtr<SkPixelRef> pixel_ref_; 220 skia::RefPtr<SkPixelRef> pixel_ref_;
221 int layer_id_; 221 int layer_id_;
222 RenderingStatsInstrumentation* rendering_stats_; 222 RenderingStatsInstrumentation* rendering_stats_;
223 const base::Callback<void(bool was_canceled)> reply_; 223 const base::Callback<void(bool was_canceled)> reply_;
224 224
225 DISALLOW_COPY_AND_ASSIGN(ImageDecodeTaskImpl); 225 DISALLOW_COPY_AND_ASSIGN(ImageDecodeTaskImpl);
226 }; 226 };
227 227
228 const size_t kScheduledRasterTasksLimit = 32u; 228 const size_t kScheduledRasterTasksLimit = 32u;
229 229
230 // Memory limit policy works by mapping some bin states to the NEVER bin.
231 const ManagedTileBin kBinPolicyMap[NUM_TILE_MEMORY_LIMIT_POLICIES][NUM_BINS] = {
232 // [ALLOW_NOTHING]
233 {NEVER_BIN, // [NOW_AND_READY_TO_DRAW_BIN]
234 NEVER_BIN, // [NOW_BIN]
235 NEVER_BIN, // [SOON_BIN]
236 NEVER_BIN, // [EVENTUALLY_AND_ACTIVE_BIN]
237 NEVER_BIN, // [EVENTUALLY_BIN]
238 NEVER_BIN, // [AT_LAST_AND_ACTIVE_BIN]
239 NEVER_BIN, // [AT_LAST_BIN]
240 NEVER_BIN // [NEVER_BIN]
241 },
242 // [ALLOW_ABSOLUTE_MINIMUM]
243 {NOW_AND_READY_TO_DRAW_BIN, // [NOW_AND_READY_TO_DRAW_BIN]
244 NOW_BIN, // [NOW_BIN]
245 NEVER_BIN, // [SOON_BIN]
246 NEVER_BIN, // [EVENTUALLY_AND_ACTIVE_BIN]
247 NEVER_BIN, // [EVENTUALLY_BIN]
248 NEVER_BIN, // [AT_LAST_AND_ACTIVE_BIN]
249 NEVER_BIN, // [AT_LAST_BIN]
250 NEVER_BIN // [NEVER_BIN]
251 },
252 // [ALLOW_PREPAINT_ONLY]
253 {NOW_AND_READY_TO_DRAW_BIN, // [NOW_AND_READY_TO_DRAW_BIN]
254 NOW_BIN, // [NOW_BIN]
255 SOON_BIN, // [SOON_BIN]
256 NEVER_BIN, // [EVENTUALLY_AND_ACTIVE_BIN]
257 NEVER_BIN, // [EVENTUALLY_BIN]
258 NEVER_BIN, // [AT_LAST_AND_ACTIVE_BIN]
259 NEVER_BIN, // [AT_LAST_BIN]
260 NEVER_BIN // [NEVER_BIN]
261 },
262 // [ALLOW_ANYTHING]
263 {NOW_AND_READY_TO_DRAW_BIN, // [NOW_AND_READY_TO_DRAW_BIN]
264 NOW_BIN, // [NOW_BIN]
265 SOON_BIN, // [SOON_BIN]
266 EVENTUALLY_AND_ACTIVE_BIN, // [EVENTUALLY_AND_ACTIVE_BIN]
267 EVENTUALLY_BIN, // [EVENTUALLY_BIN]
268 AT_LAST_AND_ACTIVE_BIN, // [AT_LAST_AND_ACTIVE_BIN]
269 AT_LAST_BIN, // [AT_LAST_BIN]
270 NEVER_BIN // [NEVER_BIN]
271 }};
272
273 // Ready to draw works by mapping NOW_BIN to NOW_AND_READY_TO_DRAW_BIN.
274 const ManagedTileBin kBinReadyToDrawMap[2][NUM_BINS] = {
275 // Not ready
276 {NOW_AND_READY_TO_DRAW_BIN, // [NOW_AND_READY_TO_DRAW_BIN]
277 NOW_BIN, // [NOW_BIN]
278 SOON_BIN, // [SOON_BIN]
279 EVENTUALLY_AND_ACTIVE_BIN, // [EVENTUALLY_AND_ACTIVE_BIN]
280 EVENTUALLY_BIN, // [EVENTUALLY_BIN]
281 AT_LAST_AND_ACTIVE_BIN, // [AT_LAST_AND_ACTIVE_BIN]
282 AT_LAST_BIN, // [AT_LAST_BIN]
283 NEVER_BIN // [NEVER_BIN]
284 },
285 // Ready
286 {NOW_AND_READY_TO_DRAW_BIN, // [NOW_AND_READY_TO_DRAW_BIN]
287 NOW_AND_READY_TO_DRAW_BIN, // [NOW_BIN]
288 SOON_BIN, // [SOON_BIN]
289 EVENTUALLY_AND_ACTIVE_BIN, // [EVENTUALLY_AND_ACTIVE_BIN]
290 EVENTUALLY_BIN, // [EVENTUALLY_BIN]
291 AT_LAST_AND_ACTIVE_BIN, // [AT_LAST_AND_ACTIVE_BIN]
292 AT_LAST_BIN, // [AT_LAST_BIN]
293 NEVER_BIN // [NEVER_BIN]
294 }};
295
296 // Active works by mapping some bin stats to equivalent _ACTIVE_BIN state.
297 const ManagedTileBin kBinIsActiveMap[2][NUM_BINS] = {
298 // Inactive
299 {NOW_AND_READY_TO_DRAW_BIN, // [NOW_AND_READY_TO_DRAW_BIN]
300 NOW_BIN, // [NOW_BIN]
301 SOON_BIN, // [SOON_BIN]
302 EVENTUALLY_AND_ACTIVE_BIN, // [EVENTUALLY_AND_ACTIVE_BIN]
303 EVENTUALLY_BIN, // [EVENTUALLY_BIN]
304 AT_LAST_AND_ACTIVE_BIN, // [AT_LAST_AND_ACTIVE_BIN]
305 AT_LAST_BIN, // [AT_LAST_BIN]
306 NEVER_BIN // [NEVER_BIN]
307 },
308 // Active
309 {NOW_AND_READY_TO_DRAW_BIN, // [NOW_AND_READY_TO_DRAW_BIN]
310 NOW_BIN, // [NOW_BIN]
311 SOON_BIN, // [SOON_BIN]
312 EVENTUALLY_AND_ACTIVE_BIN, // [EVENTUALLY_AND_ACTIVE_BIN]
313 EVENTUALLY_AND_ACTIVE_BIN, // [EVENTUALLY_BIN]
314 AT_LAST_AND_ACTIVE_BIN, // [AT_LAST_AND_ACTIVE_BIN]
315 AT_LAST_AND_ACTIVE_BIN, // [AT_LAST_BIN]
316 NEVER_BIN // [NEVER_BIN]
317 }};
318
319 // Determine bin based on three categories of tiles: things we need now,
320 // things we need soon, and eventually.
321 inline ManagedTileBin BinFromTilePriority(const TilePriority& prio) {
322 if (prio.priority_bin == TilePriority::NOW)
323 return NOW_BIN;
324
325 if (prio.priority_bin == TilePriority::SOON)
326 return SOON_BIN;
327
328 if (prio.distance_to_visible == std::numeric_limits<float>::infinity())
329 return NEVER_BIN;
330
331 return EVENTUALLY_BIN;
332 }
333
334 } // namespace 230 } // namespace
335 231
336 RasterTaskCompletionStats::RasterTaskCompletionStats() 232 RasterTaskCompletionStats::RasterTaskCompletionStats()
337 : completed_count(0u), canceled_count(0u) {} 233 : completed_count(0u), canceled_count(0u) {}
338 234
339 scoped_ptr<base::Value> RasterTaskCompletionStatsAsValue( 235 scoped_ptr<base::Value> RasterTaskCompletionStatsAsValue(
340 const RasterTaskCompletionStats& stats) { 236 const RasterTaskCompletionStats& stats) {
341 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); 237 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
342 state->SetInteger("completed_count", stats.completed_count); 238 state->SetInteger("completed_count", stats.completed_count);
343 state->SetInteger("canceled_count", stats.canceled_count); 239 state->SetInteger("canceled_count", stats.canceled_count);
(...skipping 17 matching lines...) Expand all
361 TileManager::TileManager( 257 TileManager::TileManager(
362 TileManagerClient* client, 258 TileManagerClient* client,
363 base::SequencedTaskRunner* task_runner, 259 base::SequencedTaskRunner* task_runner,
364 ResourcePool* resource_pool, 260 ResourcePool* resource_pool,
365 Rasterizer* rasterizer, 261 Rasterizer* rasterizer,
366 RenderingStatsInstrumentation* rendering_stats_instrumentation) 262 RenderingStatsInstrumentation* rendering_stats_instrumentation)
367 : client_(client), 263 : client_(client),
368 task_runner_(task_runner), 264 task_runner_(task_runner),
369 resource_pool_(resource_pool), 265 resource_pool_(resource_pool),
370 rasterizer_(rasterizer), 266 rasterizer_(rasterizer),
371 prioritized_tiles_dirty_(false),
372 all_tiles_that_need_to_be_rasterized_have_memory_(true), 267 all_tiles_that_need_to_be_rasterized_have_memory_(true),
373 all_tiles_required_for_activation_have_memory_(true),
374 memory_required_bytes_(0),
375 memory_nice_to_have_bytes_(0),
376 bytes_releasable_(0), 268 bytes_releasable_(0),
377 resources_releasable_(0), 269 resources_releasable_(0),
270 bytes_required_but_not_allocated_(0),
378 ever_exceeded_memory_budget_(false), 271 ever_exceeded_memory_budget_(false),
379 rendering_stats_instrumentation_(rendering_stats_instrumentation), 272 rendering_stats_instrumentation_(rendering_stats_instrumentation),
380 did_initialize_visible_tile_(false), 273 did_initialize_visible_tile_(false),
381 did_check_for_completed_tasks_since_last_schedule_tasks_(true), 274 did_check_for_completed_tasks_since_last_schedule_tasks_(true),
382 ready_to_activate_check_notifier_( 275 ready_to_activate_check_notifier_(
383 task_runner_, 276 task_runner_,
384 base::Bind(&TileManager::CheckIfReadyToActivate, 277 base::Bind(&TileManager::CheckIfReadyToActivate,
385 base::Unretained(this))) { 278 base::Unretained(this))) {
386 rasterizer_->SetClient(this); 279 rasterizer_->SetClient(this);
387 } 280 }
(...skipping 13 matching lines...) Expand all
401 // This should finish all pending tasks and release any uninitialized 294 // This should finish all pending tasks and release any uninitialized
402 // resources. 295 // resources.
403 rasterizer_->Shutdown(); 296 rasterizer_->Shutdown();
404 rasterizer_->CheckForCompletedTasks(); 297 rasterizer_->CheckForCompletedTasks();
405 298
406 DCHECK_EQ(0u, bytes_releasable_); 299 DCHECK_EQ(0u, bytes_releasable_);
407 DCHECK_EQ(0u, resources_releasable_); 300 DCHECK_EQ(0u, resources_releasable_);
408 } 301 }
409 302
410 void TileManager::Release(Tile* tile) { 303 void TileManager::Release(Tile* tile) {
411 prioritized_tiles_dirty_ = true;
412 released_tiles_.push_back(tile); 304 released_tiles_.push_back(tile);
413 } 305 }
414 306
415 void TileManager::DidChangeTilePriority(Tile* tile) {
416 prioritized_tiles_dirty_ = true;
417 }
418
419 bool TileManager::ShouldForceTasksRequiredForActivationToComplete() const { 307 bool TileManager::ShouldForceTasksRequiredForActivationToComplete() const {
420 return global_state_.tree_priority != SMOOTHNESS_TAKES_PRIORITY; 308 return global_state_.tree_priority != SMOOTHNESS_TAKES_PRIORITY;
421 } 309 }
422 310
423 void TileManager::CleanUpReleasedTiles() { 311 void TileManager::CleanUpReleasedTiles() {
424 for (std::vector<Tile*>::iterator it = released_tiles_.begin(); 312 for (std::vector<Tile*>::iterator it = released_tiles_.begin();
425 it != released_tiles_.end(); 313 it != released_tiles_.end();
426 ++it) { 314 ++it) {
427 Tile* tile = *it; 315 Tile* tile = *it;
428 ManagedTileState& mts = tile->managed_state(); 316 ManagedTileState& mts = tile->managed_state();
(...skipping 13 matching lines...) Expand all
442 used_layer_counts_.erase(layer_it); 330 used_layer_counts_.erase(layer_it);
443 image_decode_tasks_.erase(tile->layer_id()); 331 image_decode_tasks_.erase(tile->layer_id());
444 } 332 }
445 333
446 delete tile; 334 delete tile;
447 } 335 }
448 336
449 released_tiles_.clear(); 337 released_tiles_.clear();
450 } 338 }
451 339
452 void TileManager::UpdatePrioritizedTileSetIfNeeded() {
453 if (!prioritized_tiles_dirty_)
454 return;
455
456 CleanUpReleasedTiles();
457
458 prioritized_tiles_.Clear();
459 GetTilesWithAssignedBins(&prioritized_tiles_);
460 prioritized_tiles_dirty_ = false;
461 }
462
463 void TileManager::DidFinishRunningTasks() { 340 void TileManager::DidFinishRunningTasks() {
464 TRACE_EVENT0("cc", "TileManager::DidFinishRunningTasks"); 341 TRACE_EVENT0("cc", "TileManager::DidFinishRunningTasks");
465 342
466 bool memory_usage_above_limit = resource_pool_->total_memory_usage_bytes() > 343 bool memory_usage_above_limit = resource_pool_->total_memory_usage_bytes() >
467 global_state_.soft_memory_limit_in_bytes; 344 global_state_.soft_memory_limit_in_bytes;
468 345
469 // When OOM, keep re-assigning memory until we reach a steady state 346 // When OOM, keep re-assigning memory until we reach a steady state
470 // where top-priority tiles are initialized. 347 // where top-priority tiles are initialized.
471 if (all_tiles_that_need_to_be_rasterized_have_memory_ && 348 if (all_tiles_that_need_to_be_rasterized_have_memory_ &&
472 !memory_usage_above_limit) 349 !memory_usage_above_limit)
473 return; 350 return;
474 351
475 rasterizer_->CheckForCompletedTasks(); 352 rasterizer_->CheckForCompletedTasks();
476 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; 353 did_check_for_completed_tasks_since_last_schedule_tasks_ = true;
477 354
478 TileVector tiles_that_need_to_be_rasterized; 355 TileVector tiles_that_need_to_be_rasterized;
479 AssignGpuMemoryToTiles(&prioritized_tiles_, 356 AssignGpuMemoryToTiles(&tiles_that_need_to_be_rasterized);
480 &tiles_that_need_to_be_rasterized);
481 357
482 // |tiles_that_need_to_be_rasterized| will be empty when we reach a 358 // |tiles_that_need_to_be_rasterized| will be empty when we reach a
483 // steady memory state. Keep scheduling tasks until we reach this state. 359 // steady memory state. Keep scheduling tasks until we reach this state.
484 if (!tiles_that_need_to_be_rasterized.empty()) { 360 if (!tiles_that_need_to_be_rasterized.empty()) {
485 ScheduleTasks(tiles_that_need_to_be_rasterized); 361 ScheduleTasks(tiles_that_need_to_be_rasterized);
486 return; 362 return;
487 } 363 }
488 364
489 resource_pool_->ReduceResourceUsage(); 365 resource_pool_->ReduceResourceUsage();
490 366
(...skipping 20 matching lines...) Expand all
511 tile_version.set_rasterize_on_demand(); 387 tile_version.set_rasterize_on_demand();
512 client_->NotifyTileStateChanged(tile); 388 client_->NotifyTileStateChanged(tile);
513 } 389 }
514 } 390 }
515 391
516 DCHECK(IsReadyToActivate()); 392 DCHECK(IsReadyToActivate());
517 ready_to_activate_check_notifier_.Schedule(); 393 ready_to_activate_check_notifier_.Schedule();
518 } 394 }
519 395
520 void TileManager::DidFinishRunningTasksRequiredForActivation() { 396 void TileManager::DidFinishRunningTasksRequiredForActivation() {
521 // This is only a true indication that all tiles required for
522 // activation are initialized when no tiles are OOM. We need to
523 // wait for DidFinishRunningTasks() to be called, try to re-assign
524 // memory and in worst case use on-demand raster when tiles
525 // required for activation are OOM.
526 if (!all_tiles_required_for_activation_have_memory_)
527 return;
528
529 ready_to_activate_check_notifier_.Schedule(); 397 ready_to_activate_check_notifier_.Schedule();
530 } 398 }
531 399
532 void TileManager::GetTilesWithAssignedBins(PrioritizedTileSet* tiles) {
533 TRACE_EVENT0("cc", "TileManager::GetTilesWithAssignedBins");
534
535 // Compute new stats to be return by GetMemoryStats().
536 memory_required_bytes_ = 0;
537 memory_nice_to_have_bytes_ = 0;
538
539 const TileMemoryLimitPolicy memory_policy = global_state_.memory_limit_policy;
540 const TreePriority tree_priority = global_state_.tree_priority;
541
542 // For each tree, bin into different categories of tiles.
543 for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it) {
544 Tile* tile = it->second;
545 ManagedTileState& mts = tile->managed_state();
546
547 const ManagedTileState::TileVersion& tile_version =
548 tile->GetTileVersionForDrawing();
549 bool tile_is_ready_to_draw = tile_version.IsReadyToDraw();
550 bool tile_is_active = tile_is_ready_to_draw ||
551 mts.tile_versions[mts.raster_mode].raster_task_;
552
553 // Get the active priority and bin.
554 TilePriority active_priority = tile->priority(ACTIVE_TREE);
555 ManagedTileBin active_bin = BinFromTilePriority(active_priority);
556
557 // Get the pending priority and bin.
558 TilePriority pending_priority = tile->priority(PENDING_TREE);
559 ManagedTileBin pending_bin = BinFromTilePriority(pending_priority);
560
561 bool pending_is_low_res = pending_priority.resolution == LOW_RESOLUTION;
562 bool pending_is_non_ideal =
563 pending_priority.resolution == NON_IDEAL_RESOLUTION;
564 bool active_is_non_ideal =
565 active_priority.resolution == NON_IDEAL_RESOLUTION;
566
567 // Adjust bin state based on if ready to draw.
568 active_bin = kBinReadyToDrawMap[tile_is_ready_to_draw][active_bin];
569 pending_bin = kBinReadyToDrawMap[tile_is_ready_to_draw][pending_bin];
570
571 // Adjust bin state based on if active.
572 active_bin = kBinIsActiveMap[tile_is_active][active_bin];
573 pending_bin = kBinIsActiveMap[tile_is_active][pending_bin];
574
575 // We never want to paint new non-ideal tiles, as we always have
576 // a high-res tile covering that content (paint that instead).
577 if (!tile_is_ready_to_draw && active_is_non_ideal)
578 active_bin = NEVER_BIN;
579 if (!tile_is_ready_to_draw && pending_is_non_ideal)
580 pending_bin = NEVER_BIN;
581
582 if (!tile_is_ready_to_draw || tile_version.requires_resource()) {
583 // The bin that the tile would have if the GPU memory manager had
584 // a maximally permissive policy, send to the GPU memory manager
585 // to determine policy.
586 ManagedTileBin gpu_memmgr_stats_bin = std::min(active_bin, pending_bin);
587 if ((gpu_memmgr_stats_bin == NOW_BIN) ||
588 (gpu_memmgr_stats_bin == NOW_AND_READY_TO_DRAW_BIN))
589 memory_required_bytes_ += BytesConsumedIfAllocated(tile);
590 if (gpu_memmgr_stats_bin != NEVER_BIN)
591 memory_nice_to_have_bytes_ += BytesConsumedIfAllocated(tile);
592 }
593
594 ManagedTileBin tree_bin[NUM_TREES];
595 tree_bin[ACTIVE_TREE] = kBinPolicyMap[memory_policy][active_bin];
596 tree_bin[PENDING_TREE] = kBinPolicyMap[memory_policy][pending_bin];
597
598 // Adjust pending bin state for low res tiles. This prevents pending tree
599 // low-res tiles from being initialized before high-res tiles.
600 if (pending_is_low_res)
601 tree_bin[PENDING_TREE] = std::max(tree_bin[PENDING_TREE], EVENTUALLY_BIN);
602
603 TilePriority tile_priority;
604 switch (tree_priority) {
605 case SAME_PRIORITY_FOR_BOTH_TREES:
606 mts.bin = std::min(tree_bin[ACTIVE_TREE], tree_bin[PENDING_TREE]);
607 tile_priority = tile->combined_priority();
608 break;
609 case SMOOTHNESS_TAKES_PRIORITY:
610 mts.bin = tree_bin[ACTIVE_TREE];
611 tile_priority = active_priority;
612 break;
613 case NEW_CONTENT_TAKES_PRIORITY:
614 mts.bin = tree_bin[PENDING_TREE];
615 tile_priority = pending_priority;
616 break;
617 }
618
619 // Bump up the priority if we determined it's NEVER_BIN on one tree,
620 // but is still required on the other tree.
621 bool is_in_never_bin_on_both_trees = tree_bin[ACTIVE_TREE] == NEVER_BIN &&
622 tree_bin[PENDING_TREE] == NEVER_BIN;
623
624 if (mts.bin == NEVER_BIN && !is_in_never_bin_on_both_trees)
625 mts.bin = tile_is_active ? AT_LAST_AND_ACTIVE_BIN : AT_LAST_BIN;
626
627 mts.resolution = tile_priority.resolution;
628 mts.priority_bin = tile_priority.priority_bin;
629 mts.distance_to_visible = tile_priority.distance_to_visible;
630 mts.required_for_activation = tile_priority.required_for_activation;
631
632 mts.visible_and_ready_to_draw =
633 tree_bin[ACTIVE_TREE] == NOW_AND_READY_TO_DRAW_BIN;
634
635 // Tiles that are required for activation shouldn't be in NEVER_BIN unless
636 // smoothness takes priority or memory policy allows nothing to be
637 // initialized.
638 DCHECK(!mts.required_for_activation || mts.bin != NEVER_BIN ||
639 tree_priority == SMOOTHNESS_TAKES_PRIORITY ||
640 memory_policy == ALLOW_NOTHING);
641
642 // If the tile is in NEVER_BIN and it does not have an active task, then we
643 // can release the resources early. If it does have the task however, we
644 // should keep it in the prioritized tile set to ensure that AssignGpuMemory
645 // can visit it.
646 if (mts.bin == NEVER_BIN &&
647 !mts.tile_versions[mts.raster_mode].raster_task_) {
648 FreeResourcesForTileAndNotifyClientIfTileWasReadyToDraw(tile);
649 continue;
650 }
651
652 // Insert the tile into a priority set.
653 tiles->InsertTile(tile, mts.bin);
654 }
655 }
656
657 void TileManager::ManageTiles(const GlobalStateThatImpactsTilePriority& state) { 400 void TileManager::ManageTiles(const GlobalStateThatImpactsTilePriority& state) {
658 TRACE_EVENT0("cc", "TileManager::ManageTiles"); 401 TRACE_EVENT0("cc", "TileManager::ManageTiles");
659 402
660 // Update internal state. 403 // Update internal state.
661 if (state != global_state_) { 404 global_state_ = state;
662 global_state_ = state; 405
663 prioritized_tiles_dirty_ = true; 406 // TODO(vmpstr): See if we still need to keep tiles alive when layers release
664 } 407 // them.
408 CleanUpReleasedTiles();
665 409
666 // We need to call CheckForCompletedTasks() once in-between each call 410 // We need to call CheckForCompletedTasks() once in-between each call
667 // to ScheduleTasks() to prevent canceled tasks from being scheduled. 411 // to ScheduleTasks() to prevent canceled tasks from being scheduled.
668 if (!did_check_for_completed_tasks_since_last_schedule_tasks_) { 412 if (!did_check_for_completed_tasks_since_last_schedule_tasks_) {
669 rasterizer_->CheckForCompletedTasks(); 413 rasterizer_->CheckForCompletedTasks();
670 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; 414 did_check_for_completed_tasks_since_last_schedule_tasks_ = true;
671 } 415 }
672 416
673 UpdatePrioritizedTileSetIfNeeded();
674
675 TileVector tiles_that_need_to_be_rasterized; 417 TileVector tiles_that_need_to_be_rasterized;
676 AssignGpuMemoryToTiles(&prioritized_tiles_, 418 AssignGpuMemoryToTiles(&tiles_that_need_to_be_rasterized);
677 &tiles_that_need_to_be_rasterized);
678 419
679 // Finally, schedule rasterizer tasks. 420 // Finally, schedule rasterizer tasks.
680 ScheduleTasks(tiles_that_need_to_be_rasterized); 421 ScheduleTasks(tiles_that_need_to_be_rasterized);
681 422
682 TRACE_EVENT_INSTANT1("cc", 423 TRACE_EVENT_INSTANT1("cc",
683 "DidManage", 424 "DidManage",
684 TRACE_EVENT_SCOPE_THREAD, 425 TRACE_EVENT_SCOPE_THREAD,
685 "state", 426 "state",
686 TracedValue::FromValue(BasicStateAsValue().release())); 427 TracedValue::FromValue(BasicStateAsValue().release()));
687 428
(...skipping 20 matching lines...) Expand all
708 update_visible_tiles_stats_ = RasterTaskCompletionStats(); 449 update_visible_tiles_stats_ = RasterTaskCompletionStats();
709 450
710 bool did_initialize_visible_tile = did_initialize_visible_tile_; 451 bool did_initialize_visible_tile = did_initialize_visible_tile_;
711 did_initialize_visible_tile_ = false; 452 did_initialize_visible_tile_ = false;
712 return did_initialize_visible_tile; 453 return did_initialize_visible_tile;
713 } 454 }
714 455
715 void TileManager::GetMemoryStats(size_t* memory_required_bytes, 456 void TileManager::GetMemoryStats(size_t* memory_required_bytes,
716 size_t* memory_nice_to_have_bytes, 457 size_t* memory_nice_to_have_bytes,
717 size_t* memory_allocated_bytes, 458 size_t* memory_allocated_bytes,
718 size_t* memory_used_bytes) const { 459 size_t* memory_used_bytes) const {
reveman 2014/06/14 14:53:24 Let's remove this function completely in a separat
vmpstr 2014/06/16 18:18:19 Sounds good.
719 *memory_required_bytes = memory_required_bytes_; 460 *memory_required_bytes = resource_pool_->total_memory_usage_bytes() +
vmpstr 2014/06/13 21:08:38 ccameron@, can you please take a look to see if th
720 *memory_nice_to_have_bytes = memory_nice_to_have_bytes_; 461 bytes_required_but_not_allocated_;
462 *memory_nice_to_have_bytes = resource_pool_->total_memory_usage_bytes() +
463 bytes_required_but_not_allocated_;
721 *memory_allocated_bytes = resource_pool_->total_memory_usage_bytes(); 464 *memory_allocated_bytes = resource_pool_->total_memory_usage_bytes();
722 *memory_used_bytes = resource_pool_->acquired_memory_usage_bytes(); 465 *memory_used_bytes = resource_pool_->acquired_memory_usage_bytes();
723 } 466 }
724 467
725 scoped_ptr<base::Value> TileManager::BasicStateAsValue() const { 468 scoped_ptr<base::Value> TileManager::BasicStateAsValue() const {
726 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); 469 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
727 state->SetInteger("tile_count", tiles_.size()); 470 state->SetInteger("tile_count", tiles_.size());
728 state->Set("global_state", global_state_.AsValue().release()); 471 state->Set("global_state", global_state_.AsValue().release());
729 state->Set("memory_requirements", GetMemoryRequirementsAsValue().release()); 472 state->Set("memory_requirements", GetMemoryRequirementsAsValue().release());
730 return state.PassAs<base::Value>(); 473 return state.PassAs<base::Value>();
(...skipping 19 matching lines...) Expand all
750 &memory_allocated_bytes, 493 &memory_allocated_bytes,
751 &memory_used_bytes); 494 &memory_used_bytes);
752 requirements->SetInteger("memory_required_bytes", memory_required_bytes); 495 requirements->SetInteger("memory_required_bytes", memory_required_bytes);
753 requirements->SetInteger("memory_nice_to_have_bytes", 496 requirements->SetInteger("memory_nice_to_have_bytes",
754 memory_nice_to_have_bytes); 497 memory_nice_to_have_bytes);
755 requirements->SetInteger("memory_allocated_bytes", memory_allocated_bytes); 498 requirements->SetInteger("memory_allocated_bytes", memory_allocated_bytes);
756 requirements->SetInteger("memory_used_bytes", memory_used_bytes); 499 requirements->SetInteger("memory_used_bytes", memory_used_bytes);
757 return requirements.PassAs<base::Value>(); 500 return requirements.PassAs<base::Value>();
758 } 501 }
759 502
503 bool TileManager::FreeTileResourcesUntilUsageIsWithinBudget(
504 EvictionTileIterator* eviction_iterator,
505 const MemoryBudget& required_budget,
506 MemoryBudget* current_budget,
507 const TilePriority& max_priority,
508 bool evict_unconditionally) {
509 bool evicted_tiles_required_for_activation = false;
510 while (required_budget.Exceeds(*current_budget)) {
511 if (!*eviction_iterator)
512 break;
513
514 Tile* eviction_tile = **eviction_iterator;
515 DCHECK(eviction_tile);
516
517 TilePriority eviction_priority =
518 eviction_tile->priority_for_tree_priority(global_state_.tree_priority);
519
520 if (!evict_unconditionally &&
521 !max_priority.IsHigherPriorityThan(eviction_priority))
522 break;
523
524 size_t eviction_bytes_if_allocated =
525 BytesConsumedIfAllocated(eviction_tile);
526 ManagedTileState& eviction_mts = eviction_tile->managed_state();
527 for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
528 if (eviction_mts.tile_versions[mode].resource_) {
529 current_budget->hard_memory_bytes += eviction_bytes_if_allocated;
530 if (eviction_priority.priority_bin != TilePriority::NOW)
531 current_budget->soft_memory_bytes += eviction_bytes_if_allocated;
532 current_budget->resource_count++;
533 }
534 }
535 FreeResourcesForTileAndNotifyClientIfTileWasReadyToDraw(eviction_tile);
536 ++(*eviction_iterator);
537
538 evicted_tiles_required_for_activation |=
539 eviction_tile->required_for_activation();
540 }
541 return evicted_tiles_required_for_activation;
542 }
543
544 bool TileManager::TilePriorityViolatesMemoryPolicy(
545 const TilePriority& priority) {
546 switch (global_state_.memory_limit_policy) {
547 case ALLOW_NOTHING:
548 return true;
549 case ALLOW_ABSOLUTE_MINIMUM:
550 return priority.priority_bin > TilePriority::NOW;
551 case ALLOW_PREPAINT_ONLY:
552 return priority.priority_bin > TilePriority::SOON;
553 case ALLOW_ANYTHING:
554 return priority.distance_to_visible ==
555 std::numeric_limits<float>::infinity();
556 case NUM_TILE_MEMORY_LIMIT_POLICIES:
reveman 2014/06/14 14:53:24 please move NOTREACHED below so it fails if some r
vmpstr 2014/06/16 18:18:19 Done.
557 NOTREACHED();
558 break;
559 }
560 return true;
561 }
562
760 void TileManager::AssignGpuMemoryToTiles( 563 void TileManager::AssignGpuMemoryToTiles(
761 PrioritizedTileSet* tiles,
762 TileVector* tiles_that_need_to_be_rasterized) { 564 TileVector* tiles_that_need_to_be_rasterized) {
763 TRACE_EVENT0("cc", "TileManager::AssignGpuMemoryToTiles"); 565 TRACE_EVENT0("cc", "TileManager::AssignGpuMemoryToTiles");
764 566
765 // Maintain the list of released resources that can potentially be re-used 567 // Maintain the list of released resources that can potentially be re-used
766 // or deleted. 568 // or deleted.
767 // If this operation becomes expensive too, only do this after some 569 // If this operation becomes expensive too, only do this after some
768 // resource(s) was returned. Note that in that case, one also need to 570 // resource(s) was returned. Note that in that case, one also need to
769 // invalidate when releasing some resource from the pool. 571 // invalidate when releasing some resource from the pool.
770 resource_pool_->CheckBusyResources(); 572 resource_pool_->CheckBusyResources();
771 573
772 // Now give memory out to the tiles until we're out, and build 574 // Now give memory out to the tiles until we're out, and build
773 // the needs-to-be-rasterized queue. 575 // the needs-to-be-rasterized queue.
774 all_tiles_that_need_to_be_rasterized_have_memory_ = true; 576 all_tiles_that_need_to_be_rasterized_have_memory_ = true;
775 all_tiles_required_for_activation_have_memory_ = true;
776 577
578 MemoryBudget budget;
777 // Cast to prevent overflow. 579 // Cast to prevent overflow.
778 int64 soft_bytes_available = 580 budget.soft_memory_bytes =
779 static_cast<int64>(bytes_releasable_) +
780 static_cast<int64>(global_state_.soft_memory_limit_in_bytes) - 581 static_cast<int64>(global_state_.soft_memory_limit_in_bytes) -
781 static_cast<int64>(resource_pool_->acquired_memory_usage_bytes()); 582 static_cast<int64>(resource_pool_->acquired_memory_usage_bytes());
782 int64 hard_bytes_available = 583 budget.hard_memory_bytes =
783 static_cast<int64>(bytes_releasable_) +
784 static_cast<int64>(global_state_.hard_memory_limit_in_bytes) - 584 static_cast<int64>(global_state_.hard_memory_limit_in_bytes) -
785 static_cast<int64>(resource_pool_->acquired_memory_usage_bytes()); 585 static_cast<int64>(resource_pool_->acquired_memory_usage_bytes());
786 int resources_available = resources_releasable_ + 586 budget.resource_count = global_state_.num_resources_limit -
787 global_state_.num_resources_limit - 587 resource_pool_->acquired_resource_count();
788 resource_pool_->acquired_resource_count(); 588
789 size_t soft_bytes_allocatable = 589 MemoryBudget initial_budget = budget;
790 std::max(static_cast<int64>(0), soft_bytes_available); 590
791 size_t hard_bytes_allocatable = 591 EvictionTileIterator eviction_it(this, global_state_.tree_priority);
792 std::max(static_cast<int64>(0), hard_bytes_available); 592
793 size_t resources_allocatable = std::max(0, resources_available); 593 MemoryBudget required_budget;
594 required_budget.soft_memory_bytes = 0;
595 required_budget.hard_memory_bytes = 0;
596 required_budget.resource_count = 0;
597
598 bool evicted_tiles_required_for_activation =
599 FreeTileResourcesUntilUsageIsWithinBudget(
600 &eviction_it, required_budget, &budget, TilePriority(), true);
794 601
795 size_t bytes_that_exceeded_memory_budget = 0; 602 size_t bytes_that_exceeded_memory_budget = 0;
796 size_t soft_bytes_left = soft_bytes_allocatable;
797 size_t hard_bytes_left = hard_bytes_allocatable;
798 603
799 size_t resources_left = resources_allocatable;
800 bool oomed_soft = false; 604 bool oomed_soft = false;
801 bool oomed_hard = false; 605 bool oomed_hard = false;
802 bool have_hit_soft_memory = false; // Soft memory comes after hard. 606 bool have_hit_soft_memory = false; // Soft memory comes after hard.
803 607
804 unsigned schedule_priority = 1u; 608 unsigned schedule_priority = 1u;
805 for (PrioritizedTileSet::Iterator it(tiles, true); it; ++it) { 609 RasterTileIterator it(this, global_state_.tree_priority);
610 for (; it; ++it) {
806 Tile* tile = *it; 611 Tile* tile = *it;
612 TilePriority priority =
613 tile->priority_for_tree_priority(global_state_.tree_priority);
614
615 if (TilePriorityViolatesMemoryPolicy(priority))
616 break;
617
807 ManagedTileState& mts = tile->managed_state(); 618 ManagedTileState& mts = tile->managed_state();
808 619
809 mts.scheduled_priority = schedule_priority++; 620 mts.scheduled_priority = schedule_priority++;
810 621
811 mts.raster_mode = tile->DetermineOverallRasterMode(); 622 mts.raster_mode = tile->DetermineOverallRasterMode();
812 623
813 ManagedTileState::TileVersion& tile_version = 624 ManagedTileState::TileVersion& tile_version =
814 mts.tile_versions[mts.raster_mode]; 625 mts.tile_versions[mts.raster_mode];
815 626
816 // If this tile doesn't need a resource, then nothing to do. 627 // If this tile version is ready to draw, then nothing to do.
817 if (!tile_version.requires_resource()) 628 if (tile_version.IsReadyToDraw())
818 continue; 629 continue;
819 630
820 // If the tile is not needed, free it up. 631 const bool tile_uses_hard_limit =
821 if (mts.bin == NEVER_BIN) { 632 priority.priority_bin == TilePriority::NOW;
822 FreeResourcesForTileAndNotifyClientIfTileWasReadyToDraw(tile);
823 continue;
824 }
825
826 const bool tile_uses_hard_limit = mts.bin <= NOW_BIN;
827 const size_t bytes_if_allocated = BytesConsumedIfAllocated(tile); 633 const size_t bytes_if_allocated = BytesConsumedIfAllocated(tile);
828 const size_t tile_bytes_left =
829 (tile_uses_hard_limit) ? hard_bytes_left : soft_bytes_left;
830 634
831 // Hard-limit is reserved for tiles that would cause a calamity 635 // Hard-limit is reserved for tiles that would cause a calamity
832 // if they were to go away, so by definition they are the highest 636 // if they were to go away, so by definition they are the highest
833 // priority memory, and must be at the front of the list. 637 // priority memory, and must be at the front of the list.
834 DCHECK(!(have_hit_soft_memory && tile_uses_hard_limit)); 638 DCHECK(!(have_hit_soft_memory && tile_uses_hard_limit));
835 have_hit_soft_memory |= !tile_uses_hard_limit; 639 have_hit_soft_memory |= !tile_uses_hard_limit;
836 640
837 size_t tile_bytes = 0; 641 int64 tile_bytes = 0;
838 size_t tile_resources = 0; 642 int tile_resources = 0;
839 643
840 // It costs to maintain a resource. 644 // It costs to maintain a resource.
841 for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) { 645 for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
842 if (mts.tile_versions[mode].resource_) { 646 if (mts.tile_versions[mode].resource_) {
843 tile_bytes += bytes_if_allocated; 647 tile_bytes += bytes_if_allocated;
844 tile_resources++; 648 tile_resources++;
845 } 649 }
846 } 650 }
847 651
848 // Allow lower priority tiles with initialized resources to keep 652 // If we don't have the required version, and it's not in flight
849 // their memory by only assigning memory to new raster tasks if 653 // then we'll have to pay to create a new task.
850 // they can be scheduled. 654 if (!tile_version.resource_ && !tile_version.raster_task_) {
851 bool reached_scheduled_raster_tasks_limit = 655 tile_bytes += bytes_if_allocated;
852 tiles_that_need_to_be_rasterized->size() >= kScheduledRasterTasksLimit; 656 tile_resources++;
853 if (!reached_scheduled_raster_tasks_limit) {
854 // If we don't have the required version, and it's not in flight
855 // then we'll have to pay to create a new task.
856 if (!tile_version.resource_ && !tile_version.raster_task_) {
857 tile_bytes += bytes_if_allocated;
858 tile_resources++;
859 }
860 } 657 }
861 658
862 // Tile is OOM. 659 required_budget.soft_memory_bytes = 0;
863 if (tile_bytes > tile_bytes_left || tile_resources > resources_left) { 660 required_budget.hard_memory_bytes = 0;
864 bool was_ready_to_draw = tile->IsReadyToDraw(); 661 required_budget.resource_count = tile_resources;
662 if (tile_uses_hard_limit)
663 required_budget.hard_memory_bytes = tile_bytes;
664 else
665 required_budget.soft_memory_bytes = tile_bytes;
865 666
866 FreeResourcesForTile(tile); 667 // Handle OOM tiles.
668 evicted_tiles_required_for_activation =
669 FreeTileResourcesUntilUsageIsWithinBudget(
670 &eviction_it, required_budget, &budget, priority, false) ||
671 evicted_tiles_required_for_activation;
672
673 // Tile is still OOM.
674 if (required_budget.Exceeds(budget)) {
675 FreeResourcesForTileAndNotifyClientIfTileWasReadyToDraw(tile);
867 676
868 // This tile was already on screen and now its resources have been 677 // This tile was already on screen and now its resources have been
869 // released. In order to prevent checkerboarding, set this tile as 678 // released. In order to prevent checkerboarding, set this tile as
870 // rasterize on demand immediately. 679 // rasterize on demand immediately.
871 if (mts.visible_and_ready_to_draw) 680 if (mts.visible_and_ready_to_draw)
872 tile_version.set_rasterize_on_demand(); 681 tile_version.set_rasterize_on_demand();
873 682
874 if (was_ready_to_draw)
875 client_->NotifyTileStateChanged(tile);
876
877 oomed_soft = true; 683 oomed_soft = true;
878 if (tile_uses_hard_limit) { 684 if (tile_uses_hard_limit) {
879 oomed_hard = true; 685 oomed_hard = true;
880 bytes_that_exceeded_memory_budget += tile_bytes; 686 bytes_that_exceeded_memory_budget += tile_bytes;
881 } 687 }
882 } else { 688 } else {
883 resources_left -= tile_resources; 689 budget.resource_count -= tile_resources;
884 hard_bytes_left -= tile_bytes; 690 budget.hard_memory_bytes -= tile_bytes;
885 soft_bytes_left = 691 budget.soft_memory_bytes = (budget.soft_memory_bytes > tile_bytes)
886 (soft_bytes_left > tile_bytes) ? soft_bytes_left - tile_bytes : 0; 692 ? budget.soft_memory_bytes - tile_bytes
693 : 0;
887 if (tile_version.resource_) 694 if (tile_version.resource_)
888 continue; 695 continue;
889 } 696 }
890 697
891 DCHECK(!tile_version.resource_); 698 DCHECK(!tile_version.resource_);
892 699
893 // Tile shouldn't be rasterized if |tiles_that_need_to_be_rasterized| 700 // Tile shouldn't be rasterized if |tiles_that_need_to_be_rasterized|
894 // has reached it's limit or we've failed to assign gpu memory to this 701 // has reached it's limit or we've failed to assign gpu memory to this
895 // or any higher priority tile. Preventing tiles that fit into memory 702 // or any higher priority tile. Preventing tiles that fit into memory
896 // budget to be rasterized when higher priority tile is oom is 703 // budget to be rasterized when higher priority tile is oom is
897 // important for two reasons: 704 // important for two reasons:
898 // 1. Tile size should not impact raster priority. 705 // 1. Tile size should not impact raster priority.
899 // 2. Tiles with existing raster task could otherwise incorrectly 706 // 2. Tiles with existing raster task could otherwise incorrectly
900 // be added as they are not affected by |bytes_allocatable|. 707 // be added as they are not affected by |bytes_allocatable|.
901 bool can_schedule_tile = 708 bool can_schedule_tile =
902 !oomed_soft && !reached_scheduled_raster_tasks_limit; 709 !oomed_soft &&
710 tiles_that_need_to_be_rasterized->size() < kScheduledRasterTasksLimit;
903 711
904 if (!can_schedule_tile) { 712 if (!can_schedule_tile) {
905 all_tiles_that_need_to_be_rasterized_have_memory_ = false; 713 all_tiles_that_need_to_be_rasterized_have_memory_ = false;
906 if (tile->required_for_activation()) 714 break;
907 all_tiles_required_for_activation_have_memory_ = false;
908 it.DisablePriorityOrdering();
909 continue;
910 } 715 }
911 716
912 tiles_that_need_to_be_rasterized->push_back(tile); 717 tiles_that_need_to_be_rasterized->push_back(tile);
913 } 718 }
914 719
720 // Count up the memory that would be required on top of the allocated memory
721 // in order to initialize all visible tiles.
722 // TODO(vmpstr): Remove this once the memory manager doesn't need required
723 // bytes.
724 bytes_required_but_not_allocated_ = 0;
725 for (; it; ++it) {
726 Tile* tile = *it;
727 TilePriority priority =
728 tile->priority_for_tree_priority(global_state_.tree_priority);
729
730 if (TilePriorityViolatesMemoryPolicy(priority) ||
731 priority.priority_bin != TilePriority::NOW)
732 break;
733
734 ManagedTileState& mts = tile->managed_state();
735 mts.raster_mode = tile->DetermineOverallRasterMode();
736
737 ManagedTileState::TileVersion& tile_version =
738 mts.tile_versions[mts.raster_mode];
739
740 // If this tile version is ready to draw, then nothing to do.
741 if (tile_version.IsReadyToDraw())
742 continue;
743
744 bytes_required_but_not_allocated_ += BytesConsumedIfAllocated(tile);
745 }
746
915 // OOM reporting uses hard-limit, soft-OOM is normal depending on limit. 747 // OOM reporting uses hard-limit, soft-OOM is normal depending on limit.
916 ever_exceeded_memory_budget_ |= oomed_hard; 748 ever_exceeded_memory_budget_ |= oomed_hard;
917 if (ever_exceeded_memory_budget_) { 749 if (ever_exceeded_memory_budget_) {
918 TRACE_COUNTER_ID2("cc", 750 TRACE_COUNTER_ID2("cc",
919 "over_memory_budget", 751 "over_memory_budget",
920 this, 752 this,
921 "budget", 753 "budget",
922 global_state_.hard_memory_limit_in_bytes, 754 global_state_.hard_memory_limit_in_bytes,
923 "over", 755 "over",
924 bytes_that_exceeded_memory_budget); 756 bytes_that_exceeded_memory_budget);
925 } 757 }
926 memory_stats_from_last_assign_.total_budget_in_bytes = 758 memory_stats_from_last_assign_.total_budget_in_bytes =
927 global_state_.hard_memory_limit_in_bytes; 759 global_state_.hard_memory_limit_in_bytes;
928 memory_stats_from_last_assign_.bytes_allocated = 760 memory_stats_from_last_assign_.bytes_allocated =
929 hard_bytes_allocatable - hard_bytes_left; 761 initial_budget.hard_memory_bytes - budget.hard_memory_bytes;
930 memory_stats_from_last_assign_.bytes_unreleasable = 762 memory_stats_from_last_assign_.bytes_unreleasable =
931 resource_pool_->acquired_memory_usage_bytes() - bytes_releasable_; 763 resource_pool_->acquired_memory_usage_bytes() - bytes_releasable_;
932 memory_stats_from_last_assign_.bytes_over = bytes_that_exceeded_memory_budget; 764 memory_stats_from_last_assign_.bytes_over = bytes_that_exceeded_memory_budget;
933 } 765 }
934 766
935 void TileManager::FreeResourceForTile(Tile* tile, RasterMode mode) { 767 void TileManager::FreeResourceForTile(Tile* tile, RasterMode mode) {
936 ManagedTileState& mts = tile->managed_state(); 768 ManagedTileState& mts = tile->managed_state();
937 if (mts.tile_versions[mode].resource_) { 769 if (mts.tile_versions[mode].resource_) {
938 resource_pool_->ReleaseResource(mts.tile_versions[mode].resource_.Pass()); 770 resource_pool_->ReleaseResource(mts.tile_versions[mode].resource_.Pass());
939 771
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
1171 content_rect, 1003 content_rect,
1172 opaque_rect, 1004 opaque_rect,
1173 contents_scale, 1005 contents_scale,
1174 layer_id, 1006 layer_id,
1175 source_frame_number, 1007 source_frame_number,
1176 flags)); 1008 flags));
1177 DCHECK(tiles_.find(tile->id()) == tiles_.end()); 1009 DCHECK(tiles_.find(tile->id()) == tiles_.end());
1178 1010
1179 tiles_[tile->id()] = tile; 1011 tiles_[tile->id()] = tile;
1180 used_layer_counts_[tile->layer_id()]++; 1012 used_layer_counts_[tile->layer_id()]++;
1181 prioritized_tiles_dirty_ = true;
1182 return tile; 1013 return tile;
1183 } 1014 }
1184 1015
1185 void TileManager::GetPairedPictureLayers( 1016 void TileManager::GetPairedPictureLayers(
1186 std::vector<PairedPictureLayer>* paired_layers) const { 1017 std::vector<PairedPictureLayer>* paired_layers) const {
1187 const std::vector<PictureLayerImpl*>& layers = client_->GetPictureLayers(); 1018 const std::vector<PictureLayerImpl*>& layers = client_->GetPictureLayers();
1188 1019
1189 paired_layers->clear(); 1020 paired_layers->clear();
1190 // Reserve a maximum possible paired layers. 1021 // Reserve a maximum possible paired layers.
1191 paired_layers->reserve(layers.size()); 1022 paired_layers->reserve(layers.size());
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
1571 DCHECK(b_iterator); 1402 DCHECK(b_iterator);
1572 DCHECK(*b_iterator); 1403 DCHECK(*b_iterator);
1573 1404
1574 Tile* a_tile = **a_iterator; 1405 Tile* a_tile = **a_iterator;
1575 Tile* b_tile = **b_iterator; 1406 Tile* b_tile = **b_iterator;
1576 1407
1577 const TilePriority& a_priority = 1408 const TilePriority& a_priority =
1578 a_tile->priority_for_tree_priority(tree_priority_); 1409 a_tile->priority_for_tree_priority(tree_priority_);
1579 const TilePriority& b_priority = 1410 const TilePriority& b_priority =
1580 b_tile->priority_for_tree_priority(tree_priority_); 1411 b_tile->priority_for_tree_priority(tree_priority_);
1581 bool prioritize_low_res = tree_priority_ != SMOOTHNESS_TAKES_PRIORITY; 1412 bool prioritize_low_res = tree_priority_ == SMOOTHNESS_TAKES_PRIORITY;
1582 1413
1583 if (b_priority.resolution != a_priority.resolution) { 1414 // Now we have to return true iff b is lower priority than a.
vmpstr 2014/06/13 21:08:38 This block is parallel to what landed for the rast
reveman 2014/06/14 14:53:24 Yes, I wouldn't mind that.
1584 return (prioritize_low_res && b_priority.resolution == LOW_RESOLUTION) || 1415
1585 (!prioritize_low_res && b_priority.resolution == HIGH_RESOLUTION) || 1416 // If the bin is the same but the resolution is not, then the order will be
1586 (a_priority.resolution == NON_IDEAL_RESOLUTION); 1417 // determined by whether we prioritize low res or not.
1418 // TODO(vmpstr): Remove this when TilePriority is no longer a member of Tile
1419 // class but instead produced by the iterators.
1420 if (b_priority.priority_bin == a_priority.priority_bin &&
1421 b_priority.resolution != a_priority.resolution) {
1422 // Non ideal resolution should be sorted higher than other resolutions.
1423 if (a_priority.resolution == NON_IDEAL_RESOLUTION)
1424 return false;
1425
1426 if (b_priority.resolution == NON_IDEAL_RESOLUTION)
1427 return true;
1428
1429 if (prioritize_low_res)
1430 return a_priority.resolution == LOW_RESOLUTION;
1431
1432 return a_priority.resolution == HIGH_RESOLUTION;
1587 } 1433 }
1588 return a_priority.IsHigherPriorityThan(b_priority); 1434 return a_priority.IsHigherPriorityThan(b_priority);
1589 } 1435 }
1590 1436
1591 void TileManager::SetRasterizerForTesting(Rasterizer* rasterizer) { 1437 void TileManager::SetRasterizerForTesting(Rasterizer* rasterizer) {
1592 rasterizer_ = rasterizer; 1438 rasterizer_ = rasterizer;
1593 rasterizer_->SetClient(this); 1439 rasterizer_->SetClient(this);
1594 } 1440 }
1595 1441
1596 bool TileManager::IsReadyToActivate() const { 1442 bool TileManager::IsReadyToActivate() const {
(...skipping 13 matching lines...) Expand all
1610 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToActivate"); 1456 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToActivate");
1611 1457
1612 rasterizer_->CheckForCompletedTasks(); 1458 rasterizer_->CheckForCompletedTasks();
1613 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; 1459 did_check_for_completed_tasks_since_last_schedule_tasks_ = true;
1614 1460
1615 if (IsReadyToActivate()) 1461 if (IsReadyToActivate())
1616 client_->NotifyReadyToActivate(); 1462 client_->NotifyReadyToActivate();
1617 } 1463 }
1618 1464
1619 } // namespace cc 1465 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698