diff options
| author | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 08:31:31 +0000 |
|---|---|---|
| committer | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 08:32:37 +0000 |
| commit | 586f5e863ec302ebe288af7924a8a2c1629ac47c (patch) | |
| tree | 108bedaa8348cb02fa4cddbc5400963514c39c2b /cc/layers/picture_layer_impl.cc | |
| parent | 758506bacb1e69b6e72ede7de9bf9adc2d780fb0 (diff) | |
| download | chromium_src-586f5e863ec302ebe288af7924a8a2c1629ac47c.zip chromium_src-586f5e863ec302ebe288af7924a8a2c1629ac47c.tar.gz chromium_src-586f5e863ec302ebe288af7924a8a2c1629ac47c.tar.bz2 | |
Revert 289480 "Still produce quad when tile OOM and on demand ra..."
This caused failures on the Linux ASan bot:
http://build.chromium.org/p/chromium.memory/builders/Linux%20ASan%20LSan%20Tests%20%283%29/builds/6417/steps/cc_unittests/logs/DelegatingRendererWithTileOOM
> Still produce quad when tile OOM and on demand raster is not allowed
>
> When on demand raster is not allowed, when tiles are OOM, checkerboard
> or solid color quad should be produced rather than nothing.
>
> Add a unittest for this exact same scenario.
>
> BUG=402321
>
> Review URL: https://codereview.chromium.org/468983002
TBR=weiliangc@chromium.org
Review URL: https://codereview.chromium.org/473813002
Cr-Commit-Position: refs/heads/master@{#289492}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers/picture_layer_impl.cc')
| -rw-r--r-- | cc/layers/picture_layer_impl.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc index d304b30..8dbfedd 100644 --- a/cc/layers/picture_layer_impl.cc +++ b/cc/layers/picture_layer_impl.cc @@ -281,7 +281,6 @@ 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(); @@ -304,7 +303,6 @@ void PictureLayerImpl::AppendQuads( texture_rect, iter.texture_size(), tile_version.contents_swizzled()); - has_draw_quad = true; break; } case ManagedTileState::TileVersion::PICTURE_PILE_MODE: { @@ -335,7 +333,6 @@ void PictureLayerImpl::AppendQuads( iter->content_rect(), iter->contents_scale(), pile_); - has_draw_quad = true; break; } case ManagedTileState::TileVersion::SOLID_COLOR_MODE: { @@ -346,13 +343,10 @@ void PictureLayerImpl::AppendQuads( visible_geometry_rect, tile_version.get_solid_color(), false); - has_draw_quad = true; break; } } - } - - if (!has_draw_quad) { + } else { if (draw_checkerboard_for_missing_tiles()) { CheckerboardDrawQuad* quad = render_pass->CreateAndAppendDrawQuad<CheckerboardDrawQuad>(); |