| Index: cc/layers/picture_layer_impl.cc
|
| diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
|
| index 8dbfeddcb3678952a21b3b7d7df368b5c9c3ca45..a95b0dd503cdc345b13a3a997395de5f71361da9 100644
|
| --- a/cc/layers/picture_layer_impl.cc
|
| +++ b/cc/layers/picture_layer_impl.cc
|
| @@ -150,7 +150,6 @@ void PictureLayerImpl::AppendQuads(
|
| const OcclusionTracker<LayerImpl>& occlusion_tracker,
|
| AppendQuadsData* append_quads_data) {
|
| DCHECK(!needs_post_commit_initialization_);
|
| -
|
| float max_contents_scale = MaximumTilingContentsScale();
|
| gfx::Transform scaled_draw_transform = draw_transform();
|
| scaled_draw_transform.Scale(SK_MScalar1 / max_contents_scale,
|
| @@ -207,7 +206,6 @@ void PictureLayerImpl::AppendQuads(
|
| pile_);
|
| return;
|
| }
|
| -
|
| AppendDebugBorderQuad(
|
| render_pass, scaled_content_bounds, shared_quad_state, append_quads_data);
|
|
|
| @@ -263,7 +261,6 @@ void PictureLayerImpl::AppendQuads(
|
| // Keep track of the tilings that were used so that tilings that are
|
| // unused can be considered for removal.
|
| std::vector<PictureLayerTiling*> seen_tilings;
|
| -
|
| size_t missing_tile_count = 0u;
|
| size_t on_demand_missing_tile_count = 0u;
|
| for (PictureLayerTilingSet::CoverageIterator iter(tilings_.get(),
|
| @@ -281,6 +278,7 @@ void PictureLayerImpl::AppendQuads(
|
| append_quads_data->visible_content_area +=
|
| visible_geometry_rect.width() * visible_geometry_rect.height();
|
|
|
| + bool has_draw_quad = false;
|
| if (*iter && iter->IsReadyToDraw()) {
|
| const ManagedTileState::TileVersion& tile_version =
|
| iter->GetTileVersionForDrawing();
|
| @@ -303,6 +301,7 @@ void PictureLayerImpl::AppendQuads(
|
| texture_rect,
|
| iter.texture_size(),
|
| tile_version.contents_swizzled());
|
| + has_draw_quad = true;
|
| break;
|
| }
|
| case ManagedTileState::TileVersion::PICTURE_PILE_MODE: {
|
| @@ -333,6 +332,7 @@ void PictureLayerImpl::AppendQuads(
|
| iter->content_rect(),
|
| iter->contents_scale(),
|
| pile_);
|
| + has_draw_quad = true;
|
| break;
|
| }
|
| case ManagedTileState::TileVersion::SOLID_COLOR_MODE: {
|
| @@ -343,10 +343,13 @@ void PictureLayerImpl::AppendQuads(
|
| visible_geometry_rect,
|
| tile_version.get_solid_color(),
|
| false);
|
| + has_draw_quad = true;
|
| break;
|
| }
|
| }
|
| - } else {
|
| + }
|
| +
|
| + if (!has_draw_quad) {
|
| if (draw_checkerboard_for_missing_tiles()) {
|
| CheckerboardDrawQuad* quad =
|
| render_pass->CreateAndAppendDrawQuad<CheckerboardDrawQuad>();
|
|
|