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

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

Issue 15995033: cc: Low quality support for low res tiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review Created 7 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
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 <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "cc/debug/devtools_instrumentation.h" 14 #include "cc/debug/devtools_instrumentation.h"
15 #include "cc/debug/traced_value.h" 15 #include "cc/debug/traced_value.h"
16 #include "cc/resources/image_raster_worker_pool.h" 16 #include "cc/resources/image_raster_worker_pool.h"
17 #include "cc/resources/pixel_buffer_raster_worker_pool.h" 17 #include "cc/resources/pixel_buffer_raster_worker_pool.h"
18 #include "cc/resources/tile.h" 18 #include "cc/resources/tile.h"
19 #include "skia/ext/paint_simplifier.h"
19 #include "third_party/skia/include/core/SkCanvas.h" 20 #include "third_party/skia/include/core/SkCanvas.h"
20 #include "ui/gfx/rect_conversions.h" 21 #include "ui/gfx/rect_conversions.h"
21 22
22 namespace cc { 23 namespace cc {
23 24
24 namespace { 25 namespace {
25 26
27 class DisableLCDTextFilter : public SkDrawFilter {
28 public:
29 // SkDrawFilter interface.
30 virtual bool filter(SkPaint* paint, SkDrawFilter::Type type) OVERRIDE {
31 if (type != SkDrawFilter::kText_Type)
32 return true;
33
34 paint->setLCDRenderText(false);
35 return true;
36 }
37 };
38
26 // Determine bin based on three categories of tiles: things we need now, 39 // Determine bin based on three categories of tiles: things we need now,
27 // things we need soon, and eventually. 40 // things we need soon, and eventually.
28 inline TileManagerBin BinFromTilePriority(const TilePriority& prio) { 41 inline TileManagerBin BinFromTilePriority(const TilePriority& prio) {
29 // The amount of time for which we want to have prepainting coverage. 42 // The amount of time for which we want to have prepainting coverage.
30 const float kPrepaintingWindowTimeSeconds = 1.0f; 43 const float kPrepaintingWindowTimeSeconds = 1.0f;
31 const float kBackflingGuardDistancePixels = 314.0f; 44 const float kBackflingGuardDistancePixels = 314.0f;
32 45
33 if (prio.time_to_visible_in_seconds == 0) 46 if (prio.time_to_visible_in_seconds == 0)
34 return NOW_BIN; 47 return NOW_BIN;
35 48
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 312
300 if (!client_->ShouldForceTileUploadsRequiredForActivationToComplete()) 313 if (!client_->ShouldForceTileUploadsRequiredForActivationToComplete())
301 return; 314 return;
302 315
303 TileSet initialized_tiles; 316 TileSet initialized_tiles;
304 for (TileSet::iterator it = 317 for (TileSet::iterator it =
305 tiles_that_need_to_be_initialized_for_activation_.begin(); 318 tiles_that_need_to_be_initialized_for_activation_.begin();
306 it != tiles_that_need_to_be_initialized_for_activation_.end(); 319 it != tiles_that_need_to_be_initialized_for_activation_.end();
307 ++it) { 320 ++it) {
308 Tile* tile = *it; 321 Tile* tile = *it;
309 if (!tile->managed_state().raster_task.is_null() && 322 ManagedTileState& mts = tile->managed_state();
310 !tile->tile_version().forced_upload_) {
311 if (!raster_worker_pool_->ForceUploadToComplete(
312 tile->managed_state().raster_task))
313 continue;
314 323
315 // Setting |forced_upload_| to true makes this tile ready to draw. 324 for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
316 tile->tile_version().forced_upload_ = true; 325 ManagedTileState::TileVersion& pending_version =
317 initialized_tiles.insert(tile); 326 mts.tile_versions[mode];
327 if (!pending_version.raster_task_.is_null() &&
328 !pending_version.forced_upload_) {
329 if (!raster_worker_pool_->ForceUploadToComplete(
330 pending_version.raster_task_)) {
331 continue;
332 }
333 // Setting |forced_upload_| to true makes this tile version
334 // ready to draw.
335 pending_version.forced_upload_ = true;
336 initialized_tiles.insert(tile);
337 break;
338 }
318 } 339 }
319 } 340 }
320 341
321 for (TileSet::iterator it = initialized_tiles.begin(); 342 for (TileSet::iterator it = initialized_tiles.begin();
322 it != initialized_tiles.end(); 343 it != initialized_tiles.end();
323 ++it) { 344 ++it) {
324 Tile* tile = *it; 345 Tile* tile = *it;
325 DidFinishTileInitialization(tile); 346 DidFinishTileInitialization(tile);
326 DCHECK(tile->tile_version().IsReadyToDraw()); 347 DCHECK(tile->IsReadyToDraw(NULL));
327 } 348 }
328 } 349 }
329 350
330 void TileManager::GetMemoryStats( 351 void TileManager::GetMemoryStats(
331 size_t* memory_required_bytes, 352 size_t* memory_required_bytes,
332 size_t* memory_nice_to_have_bytes, 353 size_t* memory_nice_to_have_bytes,
333 size_t* memory_used_bytes) const { 354 size_t* memory_used_bytes) const {
334 *memory_required_bytes = 0; 355 *memory_required_bytes = 0;
335 *memory_nice_to_have_bytes = 0; 356 *memory_nice_to_have_bytes = 0;
336 *memory_used_bytes = resource_pool_->acquired_memory_usage_bytes(); 357 *memory_used_bytes = resource_pool_->acquired_memory_usage_bytes();
337 for (TileVector::const_iterator it = tiles_.begin(); 358 for (TileVector::const_iterator it = tiles_.begin();
338 it != tiles_.end(); 359 it != tiles_.end();
339 ++it) { 360 ++it) {
340 const Tile* tile = *it; 361 const Tile* tile = *it;
341 if (!tile->tile_version().requires_resource()) 362 const ManagedTileState& mts = tile->managed_state();
363
364 TileRasterMode mode;
365 if (tile->IsReadyToDraw(&mode) &&
366 !mts.tile_versions[mode].requires_resource())
342 continue; 367 continue;
343 368
344 const ManagedTileState& mts = tile->managed_state();
345 size_t tile_bytes = tile->bytes_consumed_if_allocated(); 369 size_t tile_bytes = tile->bytes_consumed_if_allocated();
346 if (mts.gpu_memmgr_stats_bin == NOW_BIN) 370 if (mts.gpu_memmgr_stats_bin == NOW_BIN)
347 *memory_required_bytes += tile_bytes; 371 *memory_required_bytes += tile_bytes;
348 if (mts.gpu_memmgr_stats_bin != NEVER_BIN) 372 if (mts.gpu_memmgr_stats_bin != NEVER_BIN)
349 *memory_nice_to_have_bytes += tile_bytes; 373 *memory_nice_to_have_bytes += tile_bytes;
350 } 374 }
351 } 375 }
352 376
353 scoped_ptr<base::Value> TileManager::BasicStateAsValue() const { 377 scoped_ptr<base::Value> TileManager::BasicStateAsValue() const {
354 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); 378 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 } 410 }
387 411
388 void TileManager::AddRequiredTileForActivation(Tile* tile) { 412 void TileManager::AddRequiredTileForActivation(Tile* tile) {
389 DCHECK(std::find(tiles_that_need_to_be_initialized_for_activation_.begin(), 413 DCHECK(std::find(tiles_that_need_to_be_initialized_for_activation_.begin(),
390 tiles_that_need_to_be_initialized_for_activation_.end(), 414 tiles_that_need_to_be_initialized_for_activation_.end(),
391 tile) == 415 tile) ==
392 tiles_that_need_to_be_initialized_for_activation_.end()); 416 tiles_that_need_to_be_initialized_for_activation_.end());
393 tiles_that_need_to_be_initialized_for_activation_.insert(tile); 417 tiles_that_need_to_be_initialized_for_activation_.insert(tile);
394 } 418 }
395 419
420 TileRasterMode TileManager::DetermineRasterMode(const Tile* tile) const {
421 DCHECK(tile);
422 DCHECK(tile->picture_pile());
423
424 TileRasterMode raster_mode;
425
426 if (tile->managed_state().resolution == LOW_RESOLUTION)
427 raster_mode = LOW_QUALITY_RASTER_MODE;
428 else if (!tile->picture_pile()->can_use_lcd_text())
429 raster_mode = HIGH_QUALITY_NO_LCD_RASTER_MODE;
430 else
431 raster_mode = HIGH_QUALITY_RASTER_MODE;
432
433 return raster_mode;
434 }
435
396 void TileManager::AssignGpuMemoryToTiles() { 436 void TileManager::AssignGpuMemoryToTiles() {
397 TRACE_EVENT0("cc", "TileManager::AssignGpuMemoryToTiles"); 437 TRACE_EVENT0("cc", "TileManager::AssignGpuMemoryToTiles");
398 438
399 // Now give memory out to the tiles until we're out, and build 439 // Now give memory out to the tiles until we're out, and build
400 // the needs-to-be-rasterized queue. 440 // the needs-to-be-rasterized queue.
401 tiles_that_need_to_be_rasterized_.clear(); 441 tiles_that_need_to_be_rasterized_.clear();
402 tiles_that_need_to_be_initialized_for_activation_.clear(); 442 tiles_that_need_to_be_initialized_for_activation_.clear();
403 443
404 size_t bytes_releasable = 0; 444 size_t bytes_releasable = 0;
405 for (TileVector::const_iterator it = tiles_.begin(); 445 for (TileVector::const_iterator it = tiles_.begin();
406 it != tiles_.end(); 446 it != tiles_.end();
407 ++it) { 447 ++it) {
408 const Tile* tile = *it; 448 const Tile* tile = *it;
409 if (tile->tile_version().resource_) 449 const ManagedTileState& mts = tile->managed_state();
410 bytes_releasable += tile->bytes_consumed_if_allocated(); 450 for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
451 if (mts.tile_versions[mode].resource_)
452 bytes_releasable += tile->bytes_consumed_if_allocated();
453 }
411 } 454 }
412 455
413 // Cast to prevent overflow. 456 // Cast to prevent overflow.
414 int64 bytes_available = 457 int64 bytes_available =
415 static_cast<int64>(bytes_releasable) + 458 static_cast<int64>(bytes_releasable) +
416 static_cast<int64>(global_state_.memory_limit_in_bytes) - 459 static_cast<int64>(global_state_.memory_limit_in_bytes) -
417 static_cast<int64>(resource_pool_->acquired_memory_usage_bytes()); 460 static_cast<int64>(resource_pool_->acquired_memory_usage_bytes());
418 461
419 size_t bytes_allocatable = 462 size_t bytes_allocatable =
420 std::max(static_cast<int64>(0), bytes_available); 463 std::max(static_cast<int64>(0), bytes_available);
421 464
422 size_t bytes_that_exceeded_memory_budget_in_now_bin = 0; 465 size_t bytes_that_exceeded_memory_budget_in_now_bin = 0;
423 size_t bytes_left = bytes_allocatable; 466 size_t bytes_left = bytes_allocatable;
424 size_t bytes_oom_in_now_bin_on_pending_tree = 0; 467 size_t bytes_oom_in_now_bin_on_pending_tree = 0;
425 TileVector tiles_requiring_memory_but_oomed; 468 TileVector tiles_requiring_memory_but_oomed;
426 bool higher_priority_tile_oomed = false; 469 bool higher_priority_tile_oomed = false;
427 for (TileVector::iterator it = tiles_.begin(); 470 for (TileVector::iterator it = tiles_.begin();
428 it != tiles_.end(); 471 it != tiles_.end();
429 ++it) { 472 ++it) {
430 Tile* tile = *it; 473 Tile* tile = *it;
431 ManagedTileState& mts = tile->managed_state(); 474 ManagedTileState& mts = tile->managed_state();
432 ManagedTileState::TileVersion& tile_version = tile->tile_version(); 475
476 // Pick the better version out of the one we already set,
477 // and the one that is required.
478 mts.raster_mode = std::min(mts.raster_mode, DetermineRasterMode(tile));
479
480 ManagedTileState::TileVersion& tile_version =
481 mts.tile_versions[mts.raster_mode];
433 482
434 // If this tile doesn't need a resource, then nothing to do. 483 // If this tile doesn't need a resource, then nothing to do.
435 if (!tile_version.requires_resource()) 484 if (!tile_version.requires_resource())
436 continue; 485 continue;
437 486
438 // If the tile is not needed, free it up. 487 // If the tile is not needed, free it up.
439 if (mts.is_in_never_bin_on_both_trees()) { 488 if (mts.is_in_never_bin_on_both_trees()) {
440 FreeResourcesForTile(tile); 489 FreeResourcesForTile(tile);
441 continue; 490 continue;
442 } 491 }
443 492
444 size_t tile_bytes = 0; 493 size_t tile_bytes = 0;
445 494
446 // It costs to maintain a resource. 495 // It costs to maintain a resource.
447 if (tile_version.resource_) 496 for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
448 tile_bytes += tile->bytes_consumed_if_allocated(); 497 if (mts.tile_versions[mode].resource_)
498 tile_bytes += tile->bytes_consumed_if_allocated();
499 }
449 500
450 // It will cost to allocate a resource. 501 // If we don't have the required version, and it's not in flight
451 // Note that this is separate from the above condition, 502 // then we'll have to pay to create a new task.
452 // so that it's clear why we're adding memory. 503 if (!tile_version.resource_ && tile_version.raster_task_.is_null())
453 if (!tile_version.resource_ && mts.raster_task.is_null())
454 tile_bytes += tile->bytes_consumed_if_allocated(); 504 tile_bytes += tile->bytes_consumed_if_allocated();
455 505
456 // Tile is OOM. 506 // Tile is OOM.
457 if (tile_bytes > bytes_left) { 507 if (tile_bytes > bytes_left) {
458 tile->tile_version().set_rasterize_on_demand(); 508 mts.tile_versions[mts.raster_mode].set_rasterize_on_demand();
459 if (mts.tree_bin[PENDING_TREE] == NOW_BIN) { 509 if (mts.tree_bin[PENDING_TREE] == NOW_BIN) {
460 tiles_requiring_memory_but_oomed.push_back(tile); 510 tiles_requiring_memory_but_oomed.push_back(tile);
461 bytes_oom_in_now_bin_on_pending_tree += tile_bytes; 511 bytes_oom_in_now_bin_on_pending_tree += tile_bytes;
462 } 512 }
463 FreeResourcesForTile(tile); 513 FreeResourcesForTile(tile);
464 higher_priority_tile_oomed = true; 514 higher_priority_tile_oomed = true;
465 continue; 515 continue;
466 } 516 }
467 517
468 tile_version.set_use_resource(); 518 tile_version.set_use_resource();
469 bytes_left -= tile_bytes; 519 bytes_left -= tile_bytes;
470 520
471 // Tile shouldn't be rasterized if we've failed to assign 521 // Tile shouldn't be rasterized if we've failed to assign
472 // gpu memory to a higher priority tile. This is important for 522 // gpu memory to a higher priority tile. This is important for
473 // two reasons: 523 // two reasons:
474 // 1. Tile size should not impact raster priority. 524 // 1. Tile size should not impact raster priority.
475 // 2. Tile with unreleasable memory could otherwise incorrectly 525 // 2. Tile with unreleasable memory could otherwise incorrectly
476 // be added as it's not affected by |bytes_allocatable|. 526 // be added as it's not affected by |bytes_allocatable|.
477 if (higher_priority_tile_oomed) 527 if (higher_priority_tile_oomed)
478 continue; 528 continue;
479 529
480 if (!tile_version.resource_) 530 if (!tile_version.resource_)
481 tiles_that_need_to_be_rasterized_.push_back(tile); 531 tiles_that_need_to_be_rasterized_.push_back(tile);
482 532
483 if (!tile_version.resource_ && tile->required_for_activation()) 533 if (!tile->IsReadyToDraw(NULL) &&
534 tile->required_for_activation()) {
484 AddRequiredTileForActivation(tile); 535 AddRequiredTileForActivation(tile);
536 }
485 } 537 }
486 538
487 // In OOM situation, we iterate tiles_, remove the memory for active tree 539 // In OOM situation, we iterate tiles_, remove the memory for active tree
488 // and not the now bin. And give them to bytes_oom_in_now_bin_on_pending_tree 540 // and not the now bin. And give them to bytes_oom_in_now_bin_on_pending_tree
489 if (!tiles_requiring_memory_but_oomed.empty()) { 541 if (!tiles_requiring_memory_but_oomed.empty()) {
490 size_t bytes_freed = 0; 542 size_t bytes_freed = 0;
491 for (TileVector::iterator it = tiles_.begin(); it != tiles_.end(); ++it) { 543 for (TileVector::iterator it = tiles_.begin(); it != tiles_.end(); ++it) {
492 Tile* tile = *it; 544 Tile* tile = *it;
493 ManagedTileState& mts = tile->managed_state(); 545 ManagedTileState& mts = tile->managed_state();
494 ManagedTileState::TileVersion& tile_version = tile->tile_version(); 546 if (mts.tree_bin[PENDING_TREE] == NEVER_BIN &&
495 if (tile_version.resource_ &&
496 mts.tree_bin[PENDING_TREE] == NEVER_BIN &&
497 mts.tree_bin[ACTIVE_TREE] != NOW_BIN) { 547 mts.tree_bin[ACTIVE_TREE] != NOW_BIN) {
498 DCHECK(!tile->required_for_activation()); 548 size_t bytes_that_can_be_freed = 0;
499 FreeResourcesForTile(tile); 549 for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
500 tile_version.set_rasterize_on_demand(); 550 ManagedTileState::TileVersion& tile_version =
501 bytes_freed += tile->bytes_consumed_if_allocated(); 551 mts.tile_versions[mode];
502 TileVector::iterator it = std::find( 552 if (tile_version.resource_) {
503 tiles_that_need_to_be_rasterized_.begin(), 553 DCHECK(!tile->required_for_activation());
504 tiles_that_need_to_be_rasterized_.end(), 554 bytes_that_can_be_freed += tile->bytes_consumed_if_allocated();
505 tile); 555 }
506 if (it != tiles_that_need_to_be_rasterized_.end()) 556 }
507 tiles_that_need_to_be_rasterized_.erase(it); 557
508 if (bytes_oom_in_now_bin_on_pending_tree <= bytes_freed) 558 if (bytes_that_can_be_freed > 0) {
509 break; 559 FreeResourcesForTile(tile);
560 bytes_freed += bytes_that_can_be_freed;
561 mts.tile_versions[mts.raster_mode].set_rasterize_on_demand();
562 TileVector::iterator it = std::find(
563 tiles_that_need_to_be_rasterized_.begin(),
564 tiles_that_need_to_be_rasterized_.end(),
565 tile);
566 if (it != tiles_that_need_to_be_rasterized_.end())
567 tiles_that_need_to_be_rasterized_.erase(it);
568 }
510 } 569 }
570
571 if (bytes_oom_in_now_bin_on_pending_tree <= bytes_freed)
572 break;
511 } 573 }
512 574
513 for (TileVector::iterator it = tiles_requiring_memory_but_oomed.begin(); 575 for (TileVector::iterator it = tiles_requiring_memory_but_oomed.begin();
514 it != tiles_requiring_memory_but_oomed.end() && bytes_freed > 0; 576 it != tiles_requiring_memory_but_oomed.end() && bytes_freed > 0;
515 ++it) { 577 ++it) {
516 Tile* tile = *it; 578 Tile* tile = *it;
579 ManagedTileState& mts = tile->managed_state();
517 size_t bytes_needed = tile->bytes_consumed_if_allocated(); 580 size_t bytes_needed = tile->bytes_consumed_if_allocated();
518 if (bytes_needed > bytes_freed) 581 if (bytes_needed > bytes_freed)
519 continue; 582 continue;
520 tile->tile_version().set_use_resource(); 583 mts.tile_versions[mts.raster_mode].set_use_resource();
521 bytes_freed -= bytes_needed; 584 bytes_freed -= bytes_needed;
522 tiles_that_need_to_be_rasterized_.push_back(tile); 585 tiles_that_need_to_be_rasterized_.push_back(tile);
523 if (tile->required_for_activation()) 586 if (tile->required_for_activation())
524 AddRequiredTileForActivation(tile); 587 AddRequiredTileForActivation(tile);
525 } 588 }
526 } 589 }
527 590
528 ever_exceeded_memory_budget_ |= 591 ever_exceeded_memory_budget_ |=
529 bytes_that_exceeded_memory_budget_in_now_bin > 0; 592 bytes_that_exceeded_memory_budget_in_now_bin > 0;
530 if (ever_exceeded_memory_budget_) { 593 if (ever_exceeded_memory_budget_) {
531 TRACE_COUNTER_ID2("cc", "over_memory_budget", this, 594 TRACE_COUNTER_ID2("cc", "over_memory_budget", this,
532 "budget", global_state_.memory_limit_in_bytes, 595 "budget", global_state_.memory_limit_in_bytes,
533 "over", bytes_that_exceeded_memory_budget_in_now_bin); 596 "over", bytes_that_exceeded_memory_budget_in_now_bin);
534 } 597 }
535 memory_stats_from_last_assign_.total_budget_in_bytes = 598 memory_stats_from_last_assign_.total_budget_in_bytes =
536 global_state_.memory_limit_in_bytes; 599 global_state_.memory_limit_in_bytes;
537 memory_stats_from_last_assign_.bytes_allocated = 600 memory_stats_from_last_assign_.bytes_allocated =
538 bytes_allocatable - bytes_left; 601 bytes_allocatable - bytes_left;
539 memory_stats_from_last_assign_.bytes_unreleasable = 602 memory_stats_from_last_assign_.bytes_unreleasable =
540 bytes_allocatable - bytes_releasable; 603 bytes_allocatable - bytes_releasable;
541 memory_stats_from_last_assign_.bytes_over = 604 memory_stats_from_last_assign_.bytes_over =
542 bytes_that_exceeded_memory_budget_in_now_bin; 605 bytes_that_exceeded_memory_budget_in_now_bin;
543 } 606 }
544 607
545 void TileManager::FreeResourcesForTile(Tile* tile) { 608 void TileManager::FreeResourceForTile(Tile* tile, TileRasterMode mode) {
546 if (tile->tile_version().resource_) { 609 ManagedTileState& mts = tile->managed_state();
610 if (mts.tile_versions[mode].resource_) {
547 resource_pool_->ReleaseResource( 611 resource_pool_->ReleaseResource(
548 tile->tile_version().resource_.Pass()); 612 mts.tile_versions[mode].resource_.Pass());
549 } 613 }
550 } 614 }
551 615
616 void TileManager::FreeResourcesForTile(Tile* tile) {
617 for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
618 FreeResourceForTile(tile, static_cast<TileRasterMode>(mode));
619 }
620 }
621
622 void TileManager::FreeUnusedResourcesForTile(Tile* tile) {
623 TileRasterMode used_mode;
624 bool version_is_used = tile->IsReadyToDraw(&used_mode);
625 for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
626 if (!version_is_used || mode != used_mode)
627 FreeResourceForTile(tile, static_cast<TileRasterMode>(mode));
628 }
629 }
630
552 void TileManager::ScheduleTasks() { 631 void TileManager::ScheduleTasks() {
553 TRACE_EVENT0("cc", "TileManager::ScheduleTasks"); 632 TRACE_EVENT0("cc", "TileManager::ScheduleTasks");
554 RasterWorkerPool::RasterTask::Queue tasks; 633 RasterWorkerPool::RasterTask::Queue tasks;
555 634
556 // Build a new task queue containing all task currently needed. Tasks 635 // Build a new task queue containing all task currently needed. Tasks
557 // are added in order of priority, highest priority task first. 636 // are added in order of priority, highest priority task first.
558 for (TileVector::iterator it = tiles_that_need_to_be_rasterized_.begin(); 637 for (TileVector::iterator it = tiles_that_need_to_be_rasterized_.begin();
559 it != tiles_that_need_to_be_rasterized_.end(); 638 it != tiles_that_need_to_be_rasterized_.end();
560 ++it) { 639 ++it) {
561 Tile* tile = *it; 640 Tile* tile = *it;
562 ManagedTileState& mts = tile->managed_state(); 641 ManagedTileState& mts = tile->managed_state();
642 ManagedTileState::TileVersion& tile_version =
643 mts.tile_versions[mts.raster_mode];
563 644
564 DCHECK(tile->tile_version().requires_resource()); 645 DCHECK(tile_version.requires_resource());
565 DCHECK(!tile->tile_version().resource_); 646 DCHECK(!tile_version.resource_);
566 647
567 // Create raster task for this tile if necessary. 648 if (tile_version.raster_task_.is_null())
568 if (mts.raster_task.is_null()) 649 tile_version.raster_task_ = CreateRasterTask(tile);
569 mts.raster_task = CreateRasterTask(tile);
570 650
571 // Finally append raster task. 651 tasks.Append(tile_version.raster_task_);
572 tasks.Append(mts.raster_task);
573 } 652 }
574 653
575 // Schedule running of |tasks|. This replaces any previously 654 // Schedule running of |tasks|. This replaces any previously
576 // scheduled tasks and effectively cancels all tasks not present 655 // scheduled tasks and effectively cancels all tasks not present
577 // in |tasks|. 656 // in |tasks|.
578 raster_worker_pool_->ScheduleTasks(&tasks); 657 raster_worker_pool_->ScheduleTasks(&tasks);
579 } 658 }
580 659
581 RasterWorkerPool::Task TileManager::CreateImageDecodeTask( 660 RasterWorkerPool::Task TileManager::CreateImageDecodeTask(
582 Tile* tile, skia::LazyPixelRef* pixel_ref) { 661 Tile* tile, skia::LazyPixelRef* pixel_ref) {
(...skipping 21 matching lines...) Expand all
604 TileManager::RasterTaskMetadata TileManager::GetRasterTaskMetadata( 683 TileManager::RasterTaskMetadata TileManager::GetRasterTaskMetadata(
605 const Tile& tile) const { 684 const Tile& tile) const {
606 RasterTaskMetadata metadata; 685 RasterTaskMetadata metadata;
607 const ManagedTileState& mts = tile.managed_state(); 686 const ManagedTileState& mts = tile.managed_state();
608 metadata.is_tile_in_pending_tree_now_bin = 687 metadata.is_tile_in_pending_tree_now_bin =
609 mts.tree_bin[PENDING_TREE] == NOW_BIN; 688 mts.tree_bin[PENDING_TREE] == NOW_BIN;
610 metadata.tile_resolution = mts.resolution; 689 metadata.tile_resolution = mts.resolution;
611 metadata.layer_id = tile.layer_id(); 690 metadata.layer_id = tile.layer_id();
612 metadata.tile_id = &tile; 691 metadata.tile_id = &tile;
613 metadata.source_frame_number = tile.source_frame_number(); 692 metadata.source_frame_number = tile.source_frame_number();
693 metadata.raster_mode = mts.raster_mode;
614 return metadata; 694 return metadata;
615 } 695 }
616 696
617 RasterWorkerPool::RasterTask TileManager::CreateRasterTask(Tile* tile) { 697 RasterWorkerPool::RasterTask TileManager::CreateRasterTask(Tile* tile) {
618 TRACE_EVENT0("cc", "TileManager::CreateRasterTask"); 698 TRACE_EVENT0("cc", "TileManager::CreateRasterTask");
619 699
700 ManagedTileState& mts = tile->managed_state();
701
620 scoped_ptr<ResourcePool::Resource> resource = 702 scoped_ptr<ResourcePool::Resource> resource =
621 resource_pool_->AcquireResource( 703 resource_pool_->AcquireResource(
622 tile->tile_size_.size(), 704 tile->tile_size_.size(),
623 tile->tile_version().resource_format_); 705 mts.tile_versions[mts.raster_mode].resource_format_);
624 const Resource* const_resource = resource.get(); 706 const Resource* const_resource = resource.get();
625 707
626 tile->tile_version().resource_id_ = resource->id(); 708 mts.tile_versions[mts.raster_mode].resource_id_ = resource->id();
627 709
628 PicturePileImpl::Analysis* analysis = new PicturePileImpl::Analysis; 710 PicturePileImpl::Analysis* analysis = new PicturePileImpl::Analysis;
629 711
630 // Create and queue all image decode tasks that this tile depends on. 712 // Create and queue all image decode tasks that this tile depends on.
631 RasterWorkerPool::Task::Set decode_tasks; 713 RasterWorkerPool::Task::Set decode_tasks;
632 for (PicturePileImpl::PixelRefIterator iter(tile->content_rect(), 714 for (PicturePileImpl::PixelRefIterator iter(tile->content_rect(),
633 tile->contents_scale(), 715 tile->contents_scale(),
634 tile->picture_pile()); 716 tile->picture_pile());
635 iter; ++iter) { 717 iter; ++iter) {
636 skia::LazyPixelRef* pixel_ref = *iter; 718 skia::LazyPixelRef* pixel_ref = *iter;
(...skipping 12 matching lines...) Expand all
649 continue; 731 continue;
650 } 732 }
651 733
652 // Create and append new image decode task for this pixel ref. 734 // Create and append new image decode task for this pixel ref.
653 RasterWorkerPool::Task decode_task = CreateImageDecodeTask( 735 RasterWorkerPool::Task decode_task = CreateImageDecodeTask(
654 tile, pixel_ref); 736 tile, pixel_ref);
655 decode_tasks.Insert(decode_task); 737 decode_tasks.Insert(decode_task);
656 pending_decode_tasks_[id] = decode_task; 738 pending_decode_tasks_[id] = decode_task;
657 } 739 }
658 740
741 RasterTaskMetadata metadata = GetRasterTaskMetadata(*tile);
659 return RasterWorkerPool::RasterTask( 742 return RasterWorkerPool::RasterTask(
660 tile->picture_pile(), 743 tile->picture_pile(),
661 const_resource, 744 const_resource,
662 base::Bind(&TileManager::RunAnalyzeAndRasterTask, 745 base::Bind(&TileManager::RunAnalyzeAndRasterTask,
663 base::Bind(&TileManager::RunAnalyzeTask, 746 base::Bind(&TileManager::RunAnalyzeTask,
664 analysis, 747 analysis,
665 tile->content_rect(), 748 tile->content_rect(),
666 tile->contents_scale(), 749 tile->contents_scale(),
667 use_color_estimator_, 750 use_color_estimator_,
668 GetRasterTaskMetadata(*tile), 751 metadata,
669 rendering_stats_instrumentation_), 752 rendering_stats_instrumentation_),
670 base::Bind(&TileManager::RunRasterTask, 753 base::Bind(&TileManager::RunRasterTask,
671 analysis, 754 analysis,
672 tile->content_rect(), 755 tile->content_rect(),
673 tile->contents_scale(), 756 tile->contents_scale(),
674 GetRasterTaskMetadata(*tile), 757 metadata,
675 rendering_stats_instrumentation_)), 758 rendering_stats_instrumentation_)),
676 base::Bind(&TileManager::OnRasterTaskCompleted, 759 base::Bind(&TileManager::OnRasterTaskCompleted,
677 base::Unretained(this), 760 base::Unretained(this),
678 make_scoped_refptr(tile), 761 make_scoped_refptr(tile),
679 base::Passed(&resource), 762 base::Passed(&resource),
680 base::Owned(analysis)), 763 base::Owned(analysis),
764 metadata.raster_mode),
681 &decode_tasks); 765 &decode_tasks);
682 } 766 }
683 767
684 void TileManager::OnRasterTaskCompleted( 768 void TileManager::OnRasterTaskCompleted(
685 scoped_refptr<Tile> tile, 769 scoped_refptr<Tile> tile,
686 scoped_ptr<ResourcePool::Resource> resource, 770 scoped_ptr<ResourcePool::Resource> resource,
687 PicturePileImpl::Analysis* analysis, 771 PicturePileImpl::Analysis* analysis,
772 TileRasterMode raster_mode,
688 bool was_canceled) { 773 bool was_canceled) {
689 TRACE_EVENT1("cc", "TileManager::OnRasterTaskCompleted", 774 TRACE_EVENT1("cc", "TileManager::OnRasterTaskCompleted",
690 "was_canceled", was_canceled); 775 "was_canceled", was_canceled);
691 776
692 ManagedTileState& mts = tile->managed_state(); 777 ManagedTileState& mts = tile->managed_state();
693 DCHECK(!mts.raster_task.is_null()); 778 ManagedTileState::TileVersion& tile_version =
694 mts.raster_task.Reset(); 779 mts.tile_versions[raster_mode];
780 DCHECK(!mts.tile_versions[raster_mode].raster_task_.is_null());
reveman 2013/06/06 15:40:13 nit: DCHECK(!tile_version.raster_task_.is_null())
781 tile_version.raster_task_.Reset();
782 tile_version.forced_upload_ = false;
reveman 2013/06/06 15:40:13 I prefer if we land this fix separately. I created
695 783
696 if (was_canceled) { 784 if (was_canceled) {
697 resource_pool_->ReleaseResource(resource.Pass()); 785 resource_pool_->ReleaseResource(resource.Pass());
698 return; 786 return;
699 } 787 }
700 788
701 mts.picture_pile_analysis = *analysis; 789 mts.picture_pile_analysis = *analysis;
702 mts.picture_pile_analyzed = true; 790 mts.picture_pile_analyzed = true;
703 791
704 if (analysis->is_solid_color) { 792 if (analysis->is_solid_color) {
705 tile->tile_version().set_solid_color(analysis->solid_color); 793 tile_version.set_solid_color(analysis->solid_color);
706 resource_pool_->ReleaseResource(resource.Pass()); 794 resource_pool_->ReleaseResource(resource.Pass());
707 } else { 795 } else {
708 tile->tile_version().resource_ = resource.Pass(); 796 tile_version.resource_ = resource.Pass();
709 } 797 }
710 798
799 FreeUnusedResourcesForTile(tile.get());
800
711 DidFinishTileInitialization(tile.get()); 801 DidFinishTileInitialization(tile.get());
712 } 802 }
713 803
714 void TileManager::DidFinishTileInitialization(Tile* tile) { 804 void TileManager::DidFinishTileInitialization(Tile* tile) {
715 if (tile->priority(ACTIVE_TREE).distance_to_visible_in_pixels == 0) 805 if (tile->priority(ACTIVE_TREE).distance_to_visible_in_pixels == 0)
716 did_initialize_visible_tile_ = true; 806 did_initialize_visible_tile_ = true;
717 if (tile->required_for_activation()) { 807 if (tile->required_for_activation()) {
718 // It's possible that a tile required for activation is not in this list 808 // It's possible that a tile required for activation is not in this list
719 // if it was marked as being required after being dispatched for 809 // if it was marked as being required after being dispatched for
720 // rasterization but before AssignGPUMemory was called again. 810 // rasterization but before AssignGPUMemory was called again.
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
784 analysis->is_solid_color &= use_color_estimator; 874 analysis->is_solid_color &= use_color_estimator;
785 } 875 }
786 876
787 scoped_ptr<base::Value> TileManager::RasterTaskMetadata::AsValue() const { 877 scoped_ptr<base::Value> TileManager::RasterTaskMetadata::AsValue() const {
788 scoped_ptr<base::DictionaryValue> res(new base::DictionaryValue()); 878 scoped_ptr<base::DictionaryValue> res(new base::DictionaryValue());
789 res->Set("tile_id", TracedValue::CreateIDRef(tile_id).release()); 879 res->Set("tile_id", TracedValue::CreateIDRef(tile_id).release());
790 res->SetBoolean("is_tile_in_pending_tree_now_bin", 880 res->SetBoolean("is_tile_in_pending_tree_now_bin",
791 is_tile_in_pending_tree_now_bin); 881 is_tile_in_pending_tree_now_bin);
792 res->Set("resolution", TileResolutionAsValue(tile_resolution).release()); 882 res->Set("resolution", TileResolutionAsValue(tile_resolution).release());
793 res->SetInteger("source_frame_number", source_frame_number); 883 res->SetInteger("source_frame_number", source_frame_number);
884 res->SetInteger("raster_mode", raster_mode);
794 return res.PassAs<base::Value>(); 885 return res.PassAs<base::Value>();
795 } 886 }
796 887
797 // static 888 // static
798 bool TileManager::RunRasterTask( 889 bool TileManager::RunRasterTask(
799 PicturePileImpl::Analysis* analysis, 890 PicturePileImpl::Analysis* analysis,
800 gfx::Rect rect, 891 gfx::Rect rect,
801 float contents_scale, 892 float contents_scale,
802 const RasterTaskMetadata& metadata, 893 const RasterTaskMetadata& metadata,
803 RenderingStatsInstrumentation* stats_instrumentation, 894 RenderingStatsInstrumentation* stats_instrumentation,
804 SkDevice* device, 895 SkDevice* device,
805 PicturePileImpl* picture_pile) { 896 PicturePileImpl* picture_pile) {
806 TRACE_EVENT1( 897 TRACE_EVENT1(
807 "cc", "TileManager::RunRasterTask", 898 "cc", "TileManager::RunRasterTask",
808 "metadata", TracedValue::FromValue(metadata.AsValue().release())); 899 "metadata", TracedValue::FromValue(metadata.AsValue().release()));
809 devtools_instrumentation::ScopedLayerTask raster_task( 900 devtools_instrumentation::ScopedLayerTask raster_task(
810 devtools_instrumentation::kRasterTask, metadata.layer_id); 901 devtools_instrumentation::kRasterTask, metadata.layer_id);
811 902
812 DCHECK(picture_pile); 903 DCHECK(picture_pile);
813 DCHECK(analysis); 904 DCHECK(analysis);
814 DCHECK(device); 905 DCHECK(device);
815 906
816 if (analysis->is_solid_color) 907 if (analysis->is_solid_color)
817 return false; 908 return false;
818 909
819 SkCanvas canvas(device); 910 SkCanvas canvas(device);
820 911
912 skia::RefPtr<SkDrawFilter> draw_filter;
913 switch (metadata.raster_mode) {
914 case LOW_QUALITY_RASTER_MODE:
915 draw_filter = skia::AdoptRef(new skia::PaintSimplifier);
916 break;
917 case HIGH_QUALITY_NO_LCD_RASTER_MODE:
918 draw_filter = skia::AdoptRef(new DisableLCDTextFilter);
919 break;
920 case HIGH_QUALITY_RASTER_MODE:
921 break;
922 case NUM_RASTER_MODES:
923 default:
924 NOTREACHED();
925 }
926
927 canvas.setDrawFilter(draw_filter.get());
928
821 if (stats_instrumentation->record_rendering_stats()) { 929 if (stats_instrumentation->record_rendering_stats()) {
822 PicturePileImpl::RasterStats raster_stats; 930 PicturePileImpl::RasterStats raster_stats;
823 picture_pile->RasterToBitmap(&canvas, rect, contents_scale, &raster_stats); 931 picture_pile->RasterToBitmap(&canvas, rect, contents_scale, &raster_stats);
824 stats_instrumentation->AddRaster( 932 stats_instrumentation->AddRaster(
825 raster_stats.total_rasterize_time, 933 raster_stats.total_rasterize_time,
826 raster_stats.best_rasterize_time, 934 raster_stats.best_rasterize_time,
827 raster_stats.total_pixels_rasterized, 935 raster_stats.total_pixels_rasterized,
828 metadata.is_tile_in_pending_tree_now_bin); 936 metadata.is_tile_in_pending_tree_now_bin);
829 937
830 HISTOGRAM_CUSTOM_COUNTS( 938 HISTOGRAM_CUSTOM_COUNTS(
831 "Renderer4.PictureRasterTimeUS", 939 "Renderer4.PictureRasterTimeUS",
832 raster_stats.total_rasterize_time.InMicroseconds(), 940 raster_stats.total_rasterize_time.InMicroseconds(),
833 0, 941 0,
834 100000, 942 100000,
835 100); 943 100);
836 } else { 944 } else {
837 picture_pile->RasterToBitmap(&canvas, rect, contents_scale, NULL); 945 picture_pile->RasterToBitmap(&canvas, rect, contents_scale, NULL);
838 } 946 }
839 947
840 return true; 948 return true;
841 } 949 }
842 950
843 } // namespace cc 951 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698