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

Unified Diff: cc/layers/painted_scrollbar_layer_impl.cc

Issue 927783002: cc: Stop passing the occlusion explicitly to AppendQuads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/painted_scrollbar_layer_impl.h ('k') | cc/layers/picture_image_layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/painted_scrollbar_layer_impl.cc
diff --git a/cc/layers/painted_scrollbar_layer_impl.cc b/cc/layers/painted_scrollbar_layer_impl.cc
index f9935cc28baa0c461cb5b70eb4950a62bb6c89f0..b05d51e500956620333a0fe5659caf05caab39cb 100644
--- a/cc/layers/painted_scrollbar_layer_impl.cc
+++ b/cc/layers/painted_scrollbar_layer_impl.cc
@@ -72,7 +72,6 @@ bool PaintedScrollbarLayerImpl::WillDraw(DrawMode draw_mode,
void PaintedScrollbarLayerImpl::AppendQuads(
RenderPass* render_pass,
- const Occlusion& occlusion_in_content_space,
AppendQuadsData* append_quads_data) {
bool premultipled_alpha = true;
bool flipped = false;
@@ -91,7 +90,8 @@ void PaintedScrollbarLayerImpl::AppendQuads(
gfx::Rect scaled_thumb_quad_rect =
gfx::ScaleToEnclosingRect(thumb_quad_rect, internal_contents_scale_);
gfx::Rect visible_thumb_quad_rect =
- occlusion_in_content_space.GetUnoccludedContentRect(thumb_quad_rect);
+ draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
+ thumb_quad_rect);
gfx::Rect scaled_visible_thumb_quad_rect = gfx::ScaleToEnclosingRect(
visible_thumb_quad_rect, internal_contents_scale_);
@@ -114,7 +114,8 @@ void PaintedScrollbarLayerImpl::AppendQuads(
gfx::Rect track_quad_rect(bounds());
gfx::Rect scaled_track_quad_rect(internal_content_bounds_);
gfx::Rect visible_track_quad_rect =
- occlusion_in_content_space.GetUnoccludedContentRect(track_quad_rect);
+ draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
+ track_quad_rect);
gfx::Rect scaled_visible_track_quad_rect = gfx::ScaleToEnclosingRect(
visible_track_quad_rect, internal_contents_scale_);
if (track_resource_id && !visible_track_quad_rect.IsEmpty()) {
« no previous file with comments | « cc/layers/painted_scrollbar_layer_impl.h ('k') | cc/layers/picture_image_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698