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

Unified Diff: cc/layers/tiled_layer_impl.cc

Issue 565043002: cc: Remove the opaque rect return-parameter from ContentLayerClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: contentlayerclientopaque: build Created 6 years, 3 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/layers/tiled_layer_impl.h ('k') | cc/layers/tiled_layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/tiled_layer_impl.cc
diff --git a/cc/layers/tiled_layer_impl.cc b/cc/layers/tiled_layer_impl.cc
index 985988274a668be4f7e61dbfa905bf0c2cdcc24f..05ead4700fb33affb7e330423be64dfb3dc1942c 100644
--- a/cc/layers/tiled_layer_impl.cc
+++ b/cc/layers/tiled_layer_impl.cc
@@ -142,7 +142,6 @@ void TiledLayerImpl::PushPropertiesTo(LayerImpl* layer) {
tiled_layer->PushTileProperties(i,
j,
tile->resource_id(),
- tile->opaque_rect(),
tile->contents_swizzled());
}
}
@@ -239,9 +238,7 @@ void TiledLayerImpl::AppendQuads(
continue;
}
- gfx::Rect tile_opaque_rect =
- contents_opaque() ? tile_rect : gfx::IntersectRects(
- tile->opaque_rect(), tile_rect);
+ gfx::Rect tile_opaque_rect = contents_opaque() ? tile_rect : gfx::Rect();
// Keep track of how the top left has moved, so the texture can be
// offset the same amount.
@@ -283,13 +280,11 @@ void TiledLayerImpl::PushTileProperties(
int i,
int j,
ResourceProvider::ResourceId resource_id,
- const gfx::Rect& opaque_rect,
bool contents_swizzled) {
DrawableTile* tile = TileAt(i, j);
if (!tile)
tile = CreateTile(i, j);
tile->set_resource_id(resource_id);
- tile->set_opaque_rect(opaque_rect);
tile->set_contents_swizzled(contents_swizzled);
}
@@ -298,16 +293,13 @@ void TiledLayerImpl::PushInvalidTile(int i, int j) {
if (!tile)
tile = CreateTile(i, j);
tile->set_resource_id(0);
- tile->set_opaque_rect(gfx::Rect());
tile->set_contents_swizzled(false);
}
SimpleEnclosedRegion TiledLayerImpl::VisibleContentOpaqueRegion() const {
if (skips_draw_)
return SimpleEnclosedRegion();
- if (contents_opaque())
- return SimpleEnclosedRegion(visible_content_rect());
- return tiler_->OpaqueRegionInContentRect(visible_content_rect());
+ return LayerImpl::VisibleContentOpaqueRegion();
}
void TiledLayerImpl::ReleaseResources() {
« no previous file with comments | « cc/layers/tiled_layer_impl.h ('k') | cc/layers/tiled_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698