summaryrefslogtreecommitdiffstats
path: root/cc/layers/picture_layer_impl.cc
diff options
context:
space:
mode:
authorreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-27 04:17:45 +0000
committerreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-27 04:17:45 +0000
commitf28d64d626f537ff37da73c5178aa63f5685bd99 (patch)
tree95281add679e4b60309a3d45b0b8dabab5c63a4a /cc/layers/picture_layer_impl.cc
parent979d31826f61b6affaa6d32385fa95ee60ddb909 (diff)
downloadchromium_src-f28d64d626f537ff37da73c5178aa63f5685bd99.zip
chromium_src-f28d64d626f537ff37da73c5178aa63f5685bd99.tar.gz
chromium_src-f28d64d626f537ff37da73c5178aa63f5685bd99.tar.bz2
cc: Remove unnecessary "default" cases from switch statements.
Makes all cc/ code consistent and improves compile time error checking when adding new enums. TEST=compile,cc_unittests BUG=277861 Review URL: https://chromiumcodereview.appspot.com/22875045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers/picture_layer_impl.cc')
-rw-r--r--cc/layers/picture_layer_impl.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 8b7ed9c..08e54ff 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -227,6 +227,7 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
const ManagedTileState::TileVersion& tile_version =
iter->GetTileVersionForDrawing();
+ scoped_ptr<DrawQuad> draw_quad;
switch (tile_version.mode()) {
case ManagedTileState::TileVersion::RESOURCE_MODE: {
gfx::RectF texture_rect = iter.texture_rect();
@@ -244,7 +245,7 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
texture_rect,
iter.texture_size(),
tile_version.contents_swizzled());
- quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
+ draw_quad = quad.PassAs<DrawQuad>();
break;
}
case ManagedTileState::TileVersion::PICTURE_PILE_MODE: {
@@ -267,7 +268,7 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
iter->contents_scale(),
draw_direct_to_backbuffer,
pile_);
- quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
+ draw_quad = quad.PassAs<DrawQuad>();
break;
}
case ManagedTileState::TileVersion::SOLID_COLOR_MODE: {
@@ -276,13 +277,14 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
geometry_rect,
tile_version.get_solid_color(),
false);
- quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
+ draw_quad = quad.PassAs<DrawQuad>();
break;
}
- default:
- NOTREACHED();
}
+ DCHECK(draw_quad);
+ quad_sink->Append(draw_quad.Pass(), append_quads_data);
+
if (!seen_tilings.size() || seen_tilings.back() != iter.CurrentTiling())
seen_tilings.push_back(iter.CurrentTiling());
}