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

Unified Diff: cc/layers/picture_layer_impl.cc

Issue 22875045: cc: Remove unnecessary "default" cases from switch statements. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix HasFilterThatMovesPixels()/HasFilterThatAffectsOpacity() Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/animation/transform_operation.cc ('k') | cc/output/filter_operation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/picture_layer_impl.cc
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 8b7ed9c19de9bd5d3f72bfc28d3fc5ec39f6457c..08e54ff80a52b5f7f2996aa9903b1a71e243e9c3 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());
}
« no previous file with comments | « cc/animation/transform_operation.cc ('k') | cc/output/filter_operation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698