| Index: cc/delegated_renderer_layer.cc
|
| diff --git a/cc/delegated_renderer_layer.cc b/cc/delegated_renderer_layer.cc
|
| index 30b9f9bce55565c803b224ee4ea9f6efc3ab6029..3d55f409ecb8e7deac85d1ab24ab46f335093cfe 100644
|
| --- a/cc/delegated_renderer_layer.cc
|
| +++ b/cc/delegated_renderer_layer.cc
|
| @@ -37,16 +37,22 @@ void DelegatedRendererLayer::pushPropertiesTo(LayerImpl* impl) {
|
|
|
| delegated_impl->SetDisplaySize(display_size_);
|
|
|
| - if (frame_data_) {
|
| - if (frame_size_.IsEmpty()) {
|
| - scoped_ptr<DelegatedFrameData> empty_frame(new DelegatedFrameData);
|
| - delegated_impl->SetFrameData(empty_frame.Pass(), gfx::Rect());
|
| - } else {
|
| - delegated_impl->SetFrameData(frame_data_.Pass(), damage_in_frame_);
|
| - }
|
| - frame_data_.reset();
|
| - damage_in_frame_ = gfx::RectF();
|
| + if (!frame_data_)
|
| + return;
|
| +
|
| + // TODO(danakj): Save these resources somewhere where we can collect them for
|
| + // the frame ack.
|
| + TransferableResourceArray resources_for_ack;
|
| + if (frame_size_.IsEmpty()) {
|
| + scoped_ptr<DelegatedFrameData> empty_frame(new DelegatedFrameData);
|
| + delegated_impl->SetFrameData(
|
| + empty_frame.Pass(), gfx::Rect(), &resources_for_ack);
|
| + } else {
|
| + delegated_impl->SetFrameData(
|
| + frame_data_.Pass(), damage_in_frame_, &resources_for_ack);
|
| }
|
| + frame_data_.reset();
|
| + damage_in_frame_ = gfx::RectF();
|
| }
|
|
|
| void DelegatedRendererLayer::SetDisplaySize(gfx::Size size) {
|
|
|