Index: cc/layers/tiled_layer_impl.cc |
diff --git a/cc/layers/tiled_layer_impl.cc b/cc/layers/tiled_layer_impl.cc |
index 535744d51293a8b9a637be2a0b9b7cf7a2982cce..234bd44a31a54aaa47bf0115c999e80e9f0907c5 100644 |
--- a/cc/layers/tiled_layer_impl.cc |
+++ b/cc/layers/tiled_layer_impl.cc |
@@ -113,7 +113,7 @@ scoped_ptr<LayerImpl> TiledLayerImpl::CreateLayerImpl( |
return TiledLayerImpl::Create(tree_impl, id(), synced_scroll_offset()); |
} |
-void TiledLayerImpl::AsValueInto(base::debug::TracedValue* state) const { |
+void TiledLayerImpl::AsValueInto(base::trace_event::TracedValue* state) const { |
LayerImpl::AsValueInto(state); |
MathUtil::AddToTracedValue("invalidation", update_rect(), state); |
} |
@@ -166,7 +166,6 @@ bool TiledLayerImpl::WillDraw(DrawMode draw_mode, |
} |
void TiledLayerImpl::AppendQuads(RenderPass* render_pass, |
- const Occlusion& occlusion_in_content_space, |
AppendQuadsData* append_quads_data) { |
DCHECK(tiler_); |
DCHECK(!tiler_->has_empty_bounds()); |
@@ -225,7 +224,8 @@ void TiledLayerImpl::AppendQuads(RenderPass* render_pass, |
continue; |
gfx::Rect visible_tile_rect = |
- occlusion_in_content_space.GetUnoccludedContentRect(tile_rect); |
+ draw_properties().occlusion_in_content_space.GetUnoccludedContentRect( |
+ tile_rect); |
if (visible_tile_rect.IsEmpty()) |
continue; |