Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/delegated_renderer_layer.h" | 5 #include "cc/delegated_renderer_layer.h" |
| 6 | 6 |
| 7 #include "cc/delegated_frame_data.h" | 7 #include "cc/delegated_frame_data.h" |
| 8 #include "cc/delegated_renderer_layer_impl.h" | 8 #include "cc/delegated_renderer_layer_impl.h" |
| 9 | 9 |
| 10 namespace cc { | 10 namespace cc { |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 30 } | 30 } |
| 31 | 31 |
| 32 void DelegatedRendererLayer::pushPropertiesTo(LayerImpl* impl) { | 32 void DelegatedRendererLayer::pushPropertiesTo(LayerImpl* impl) { |
| 33 Layer::pushPropertiesTo(impl); | 33 Layer::pushPropertiesTo(impl); |
| 34 | 34 |
| 35 DelegatedRendererLayerImpl* delegated_impl = | 35 DelegatedRendererLayerImpl* delegated_impl = |
| 36 static_cast<DelegatedRendererLayerImpl*>(impl); | 36 static_cast<DelegatedRendererLayerImpl*>(impl); |
| 37 | 37 |
| 38 delegated_impl->SetDisplaySize(display_size_); | 38 delegated_impl->SetDisplaySize(display_size_); |
| 39 | 39 |
| 40 if (frame_data_) { | 40 if (!frame_data_) |
| 41 if (frame_size_.IsEmpty()) { | 41 return; |
| 42 scoped_ptr<DelegatedFrameData> empty_frame(new DelegatedFrameData); | 42 |
| 43 delegated_impl->SetFrameData(empty_frame.Pass(), gfx::Rect()); | 43 // TODO(danakj): Save these resources somewhere where we can collect them for |
| 44 } else { | 44 // the frame ack. |
| 45 delegated_impl->SetFrameData(frame_data_.Pass(), damage_in_frame_); | 45 TransferableResourceArray resources_for_ack; |
| 46 } | 46 if (frame_size_.IsEmpty()) { |
| 47 frame_data_.reset(); | 47 scoped_ptr<DelegatedFrameData> empty_frame(new DelegatedFrameData); |
| 48 damage_in_frame_ = gfx::RectF(); | 48 delegated_impl->SetFrameData( |
| 49 empty_frame.Pass(), gfx::Rect(), &resources_for_ack); | |
| 50 } else { | |
| 51 delegated_impl->SetFrameData( | |
| 52 frame_data_.Pass(), damage_in_frame_, &resources_for_ack); | |
| 49 } | 53 } |
| 54 frame_data_.reset(); | |
| 55 damage_in_frame_ = gfx::RectF(); | |
| 50 } | 56 } |
| 51 | 57 |
| 52 void DelegatedRendererLayer::SetDisplaySize(gfx::Size size) { | 58 void DelegatedRendererLayer::SetDisplaySize(gfx::Size size) { |
| 53 if (display_size_ == size) | 59 if (display_size_ == size) |
| 54 return; | 60 return; |
| 55 display_size_ = size; | 61 display_size_ = size; |
| 56 setNeedsCommit(); | 62 setNeedsCommit(); |
| 57 } | 63 } |
| 58 | 64 |
| 59 void DelegatedRendererLayer::SetFrameData( | 65 void DelegatedRendererLayer::SetFrameData( |
| 60 scoped_ptr<DelegatedFrameData> new_frame_data) { | 66 scoped_ptr<DelegatedFrameData> new_frame_data) { |
| 61 frame_data_ = new_frame_data.Pass(); | 67 frame_data_ = new_frame_data.Pass(); |
|
piman
2013/02/27 23:09:39
If we already had a frame_data_, we need to merge
| |
| 62 if (!frame_data_->render_pass_list.empty()) { | 68 if (!frame_data_->render_pass_list.empty()) { |
| 63 RenderPass* root_pass = frame_data_->render_pass_list.back(); | 69 RenderPass* root_pass = frame_data_->render_pass_list.back(); |
| 64 damage_in_frame_.Union(root_pass->damage_rect); | 70 damage_in_frame_.Union(root_pass->damage_rect); |
| 65 frame_size_ = root_pass->output_rect.size(); | 71 frame_size_ = root_pass->output_rect.size(); |
| 66 } else { | 72 } else { |
| 67 frame_size_ = gfx::Size(); | 73 frame_size_ = gfx::Size(); |
| 68 } | 74 } |
| 69 setNeedsCommit(); | 75 setNeedsCommit(); |
| 70 } | 76 } |
| 71 | 77 |
| 72 } // namespace cc | 78 } // namespace cc |
| OLD | NEW |