diff options
author | danakj <danakj@chromium.org> | 2015-02-13 17:53:22 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-14 01:54:15 +0000 |
commit | a8c66a5d291cc7d3c57572a8498ac5ca392563ec (patch) | |
tree | 3d55b4e2f77618d9f83791c7dcc95af25c93ec85 /cc/layers/nine_patch_layer_impl.cc | |
parent | cb82fa890de34f540382015ae1942f5214c7e9e4 (diff) | |
download | chromium_src-a8c66a5d291cc7d3c57572a8498ac5ca392563ec.zip chromium_src-a8c66a5d291cc7d3c57572a8498ac5ca392563ec.tar.gz chromium_src-a8c66a5d291cc7d3c57572a8498ac5ca392563ec.tar.bz2 |
cc: Stop passing the occlusion explicitly to AppendQuads.
The occlusion is a draw property, the layer can access it from there
like other draw properties.
Cleanup CL since moving occlusion to draw properties. Too many
AppendQuads overrides... :(
R=enne
BUG=446751
NOTRY=true
Review URL: https://codereview.chromium.org/927783002
Cr-Commit-Position: refs/heads/master@{#316358}
Diffstat (limited to 'cc/layers/nine_patch_layer_impl.cc')
-rw-r--r-- | cc/layers/nine_patch_layer_impl.cc | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/cc/layers/nine_patch_layer_impl.cc b/cc/layers/nine_patch_layer_impl.cc index 82ba480..832efb3 100644 --- a/cc/layers/nine_patch_layer_impl.cc +++ b/cc/layers/nine_patch_layer_impl.cc @@ -82,7 +82,6 @@ void NinePatchLayerImpl::CheckGeometryLimitations() { void NinePatchLayerImpl::AppendQuads( RenderPass* render_pass, - const Occlusion& occlusion_in_content_space, AppendQuadsData* append_quads_data) { CheckGeometryLimitations(); SharedQuadState* shared_quad_state = @@ -214,7 +213,8 @@ void NinePatchLayerImpl::AppendQuads( const bool opaque = layer_tree_impl()->IsUIResourceOpaque(ui_resource_id_); visible_rect = - occlusion_in_content_space.GetUnoccludedContentRect(layer_top_left); + draw_properties().occlusion_in_content_space.GetUnoccludedContentRect( + layer_top_left); opaque_rect = opaque ? visible_rect : gfx::Rect(); if (!visible_rect.IsEmpty()) { TextureDrawQuad* quad = @@ -234,7 +234,8 @@ void NinePatchLayerImpl::AppendQuads( } visible_rect = - occlusion_in_content_space.GetUnoccludedContentRect(layer_top_right); + draw_properties().occlusion_in_content_space.GetUnoccludedContentRect( + layer_top_right); opaque_rect = opaque ? visible_rect : gfx::Rect(); if (!visible_rect.IsEmpty()) { TextureDrawQuad* quad = @@ -254,7 +255,8 @@ void NinePatchLayerImpl::AppendQuads( } visible_rect = - occlusion_in_content_space.GetUnoccludedContentRect(layer_bottom_left); + draw_properties().occlusion_in_content_space.GetUnoccludedContentRect( + layer_bottom_left); opaque_rect = opaque ? visible_rect : gfx::Rect(); if (!visible_rect.IsEmpty()) { TextureDrawQuad* quad = @@ -274,7 +276,8 @@ void NinePatchLayerImpl::AppendQuads( } visible_rect = - occlusion_in_content_space.GetUnoccludedContentRect(layer_bottom_right); + draw_properties().occlusion_in_content_space.GetUnoccludedContentRect( + layer_bottom_right); opaque_rect = opaque ? visible_rect : gfx::Rect(); if (!visible_rect.IsEmpty()) { TextureDrawQuad* quad = @@ -293,7 +296,9 @@ void NinePatchLayerImpl::AppendQuads( nearest_neighbor); } - visible_rect = occlusion_in_content_space.GetUnoccludedContentRect(layer_top); + visible_rect = + draw_properties().occlusion_in_content_space.GetUnoccludedContentRect( + layer_top); opaque_rect = opaque ? visible_rect : gfx::Rect(); if (!visible_rect.IsEmpty()) { TextureDrawQuad* quad = @@ -313,7 +318,8 @@ void NinePatchLayerImpl::AppendQuads( } visible_rect = - occlusion_in_content_space.GetUnoccludedContentRect(layer_left); + draw_properties().occlusion_in_content_space.GetUnoccludedContentRect( + layer_left); opaque_rect = opaque ? visible_rect : gfx::Rect(); if (!visible_rect.IsEmpty()) { TextureDrawQuad* quad = @@ -333,7 +339,8 @@ void NinePatchLayerImpl::AppendQuads( } visible_rect = - occlusion_in_content_space.GetUnoccludedContentRect(layer_right); + draw_properties().occlusion_in_content_space.GetUnoccludedContentRect( + layer_right); opaque_rect = opaque ? visible_rect : gfx::Rect(); if (!visible_rect.IsEmpty()) { TextureDrawQuad* quad = @@ -353,7 +360,8 @@ void NinePatchLayerImpl::AppendQuads( } visible_rect = - occlusion_in_content_space.GetUnoccludedContentRect(layer_bottom); + draw_properties().occlusion_in_content_space.GetUnoccludedContentRect( + layer_bottom); opaque_rect = opaque ? visible_rect : gfx::Rect(); if (!visible_rect.IsEmpty()) { TextureDrawQuad* quad = @@ -374,7 +382,8 @@ void NinePatchLayerImpl::AppendQuads( if (fill_center_) { visible_rect = - occlusion_in_content_space.GetUnoccludedContentRect(layer_center); + draw_properties().occlusion_in_content_space.GetUnoccludedContentRect( + layer_center); opaque_rect = opaque ? visible_rect : gfx::Rect(); if (!visible_rect.IsEmpty()) { TextureDrawQuad* quad = |