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 TransferableResource::ReturnResources( |
74 unused_resources_for_child_compositor_.end(), | 74 frame_data_->resource_list, |
75 frame_data_->resource_list.begin(), | 75 &unused_resources_for_child_compositor_); |
76 frame_data_->resource_list.end()); | |
77 } | 76 } |
78 frame_data_ = new_frame_data.Pass(); | 77 frame_data_ = new_frame_data.Pass(); |
79 if (!frame_data_->render_pass_list.empty()) { | 78 if (!frame_data_->render_pass_list.empty()) { |
80 RenderPass* root_pass = frame_data_->render_pass_list.back(); | 79 RenderPass* root_pass = frame_data_->render_pass_list.back(); |
81 damage_in_frame_.Union(root_pass->damage_rect); | 80 damage_in_frame_.Union(root_pass->damage_rect); |
82 frame_size_ = root_pass->output_rect.size(); | 81 frame_size_ = root_pass->output_rect.size(); |
83 } else { | 82 } else { |
84 frame_size_ = gfx::Size(); | 83 frame_size_ = gfx::Size(); |
85 } | 84 } |
86 SetNeedsCommit(); | 85 SetNeedsCommit(); |
87 } | 86 } |
88 | 87 |
89 void DelegatedRendererLayer::TakeUnusedResourcesForChildCompositor( | 88 void DelegatedRendererLayer::TakeUnusedResourcesForChildCompositor( |
90 TransferableResourceArray* array) { | 89 ReturnedResourceArray* array) { |
91 DCHECK(array->empty()); | 90 DCHECK(array->empty()); |
92 array->clear(); | 91 array->clear(); |
93 | 92 |
94 array->swap(unused_resources_for_child_compositor_); | 93 array->swap(unused_resources_for_child_compositor_); |
95 } | 94 } |
96 | 95 |
97 bool DelegatedRendererLayer::BlocksPendingCommit() const { | 96 bool DelegatedRendererLayer::BlocksPendingCommit() const { |
98 // The active frame needs to be replaced and resources returned before the | 97 // 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 | 98 // 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 | 99 // resources to return, regardless of if the layer will draw in its new |
101 // state. | 100 // state. |
102 return true; | 101 return true; |
103 } | 102 } |
104 | 103 |
105 } // namespace cc | 104 } // namespace cc |
OLD | NEW |