| 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/layers/delegated_renderer_layer.h" | 5 #include "cc/layers/delegated_renderer_layer.h" |
| 6 | 6 |
| 7 #include "cc/layers/delegated_renderer_layer_client.h" | 7 #include "cc/layers/delegated_renderer_layer_client.h" |
| 8 #include "cc/layers/delegated_renderer_layer_impl.h" | 8 #include "cc/layers/delegated_renderer_layer_impl.h" |
| 9 #include "cc/output/delegated_frame_data.h" | 9 #include "cc/output/delegated_frame_data.h" |
| 10 | 10 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 return; | 63 return; |
| 64 display_size_ = size; | 64 display_size_ = size; |
| 65 SetNeedsCommit(); | 65 SetNeedsCommit(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 void DelegatedRendererLayer::SetFrameData( | 68 void DelegatedRendererLayer::SetFrameData( |
| 69 scoped_ptr<DelegatedFrameData> new_frame_data) { | 69 scoped_ptr<DelegatedFrameData> new_frame_data) { |
| 70 if (frame_data_) { | 70 if (frame_data_) { |
| 71 // Copy the resources from the last provided frame into the unused resources | 71 // Copy the resources from the last provided frame into the unused resources |
| 72 // list, as the new frame will provide its own resources. | 72 // list, as the new frame will provide its own resources. |
| 73 unused_resources_for_child_compositor_.insert( | 73 ReturnResources(frame_data_->resource_list, |
| 74 unused_resources_for_child_compositor_.end(), | 74 &unused_resources_for_child_compositor_); |
| 75 frame_data_->resource_list.begin(), | |
| 76 frame_data_->resource_list.end()); | |
| 77 } | 75 } |
| 78 frame_data_ = new_frame_data.Pass(); | 76 frame_data_ = new_frame_data.Pass(); |
| 79 if (!frame_data_->render_pass_list.empty()) { | 77 if (!frame_data_->render_pass_list.empty()) { |
| 80 RenderPass* root_pass = frame_data_->render_pass_list.back(); | 78 RenderPass* root_pass = frame_data_->render_pass_list.back(); |
| 81 damage_in_frame_.Union(root_pass->damage_rect); | 79 damage_in_frame_.Union(root_pass->damage_rect); |
| 82 frame_size_ = root_pass->output_rect.size(); | 80 frame_size_ = root_pass->output_rect.size(); |
| 83 } else { | 81 } else { |
| 84 frame_size_ = gfx::Size(); | 82 frame_size_ = gfx::Size(); |
| 85 } | 83 } |
| 86 SetNeedsCommit(); | 84 SetNeedsCommit(); |
| 87 } | 85 } |
| 88 | 86 |
| 89 void DelegatedRendererLayer::TakeUnusedResourcesForChildCompositor( | 87 void DelegatedRendererLayer::TakeUnusedResourcesForChildCompositor( |
| 90 TransferableResourceArray* array) { | 88 ReturnedResourceArray* array) { |
| 91 DCHECK(array->empty()); | 89 DCHECK(array->empty()); |
| 92 array->clear(); | 90 array->clear(); |
| 93 | 91 |
| 94 array->swap(unused_resources_for_child_compositor_); | 92 array->swap(unused_resources_for_child_compositor_); |
| 95 } | 93 } |
| 96 | 94 |
| 97 bool DelegatedRendererLayer::BlocksPendingCommit() const { | 95 bool DelegatedRendererLayer::BlocksPendingCommit() const { |
| 98 // The active frame needs to be replaced and resources returned before the | 96 // The active frame needs to be replaced and resources returned before the |
| 99 // commit is called complete. This is true even whenever there may be | 97 // commit is called complete. This is true even whenever there may be |
| 100 // resources to return, regardless of if the layer will draw in its new | 98 // resources to return, regardless of if the layer will draw in its new |
| 101 // state. | 99 // state. |
| 102 return true; | 100 return true; |
| 103 } | 101 } |
| 104 | 102 |
| 105 } // namespace cc | 103 } // namespace cc |
| OLD | NEW |