Chromium Code Reviews| Index: cc/layers/delegated_renderer_layer.cc |
| diff --git a/cc/layers/delegated_renderer_layer.cc b/cc/layers/delegated_renderer_layer.cc |
| index a940903b966d2fe87ca786fc819ea525593e7803..c29c2d32a368b6d0119098a476c573cf6913d9b1 100644 |
| --- a/cc/layers/delegated_renderer_layer.cc |
| +++ b/cc/layers/delegated_renderer_layer.cc |
| @@ -4,7 +4,6 @@ |
| #include "cc/layers/delegated_renderer_layer.h" |
| -#include "cc/layers/delegated_renderer_layer_client.h" |
| #include "cc/layers/delegated_renderer_layer_impl.h" |
| #include "cc/output/delegated_frame_data.h" |
| #include "cc/quads/render_pass_draw_quad.h" |
| @@ -14,17 +13,14 @@ |
| namespace cc { |
| scoped_refptr<DelegatedRendererLayer> DelegatedRendererLayer::Create( |
| - DelegatedRendererLayerClient* client, |
| const scoped_refptr<DelegatedFrameProvider>& frame_provider) { |
| return scoped_refptr<DelegatedRendererLayer>( |
| - new DelegatedRendererLayer(client, frame_provider)); |
| + new DelegatedRendererLayer(frame_provider)); |
| } |
| DelegatedRendererLayer::DelegatedRendererLayer( |
| - DelegatedRendererLayerClient* client, |
| const scoped_refptr<DelegatedFrameProvider>& frame_provider) |
| : Layer(), |
| - client_(client), |
| frame_provider_(frame_provider), |
| should_collect_new_frame_(true), |
| frame_data_(NULL), |
| @@ -81,14 +77,8 @@ void DelegatedRendererLayer::PushPropertiesTo(LayerImpl* impl) { |
| frame_data_ = NULL; |
| frame_damage_ = gfx::RectF(); |
| - // The ResourceProvider will have the new frame as soon as we push it to the |
| - // pending tree. So resources no longer in use will be returned as well. |
| - if (client_) |
| - client_->DidCommitFrameData(); |
| - |
| - // TODO(danakj): The DidCommitFrameData() notification requires a push |
| - // properties to happen in order to notify about resources returned |
| - // from the parent compositor that are no longer in use. crbug.com/259090 |
| + // TODO(danakj): The following line needs to be removed. Currently, removal |
| + // breaks unit tests. |
|
danakj
2013/12/03 18:28:27
Can you keep crbug.com/323049 in the comment?
powei
2013/12/03 18:38:53
Done. But do you really want crbug.com/323049 and
|
| needs_push_properties_ = true; |
| } |