| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_frame_provider.h" | 5 #include "cc/layers/delegated_frame_provider.h" |
| 6 | 6 |
| 7 #include "cc/layers/delegated_frame_resource_collection.h" | 7 #include "cc/layers/delegated_frame_resource_collection.h" |
| 8 #include "cc/layers/delegated_renderer_layer.h" | 8 #include "cc/layers/delegated_renderer_layer.h" |
| 9 #include "cc/output/delegated_frame_data.h" | 9 #include "cc/output/delegated_frame_data.h" |
| 10 #include "cc/quads/render_pass_draw_quad.h" | 10 #include "cc/quads/render_pass_draw_quad.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 TransferableResource::ReturnResources(frame_->resource_list, &returned); | 26 TransferableResource::ReturnResources(frame_->resource_list, &returned); |
| 27 resource_collection_->UnrefResources(returned); | 27 resource_collection_->UnrefResources(returned); |
| 28 } | 28 } |
| 29 | 29 |
| 30 void DelegatedFrameProvider::AddObserver(DelegatedRendererLayer* layer) { | 30 void DelegatedFrameProvider::AddObserver(DelegatedRendererLayer* layer) { |
| 31 #if DCHECK_IS_ON() | 31 #if DCHECK_IS_ON() |
| 32 for (size_t i = 0; i < observers_.size(); ++i) | 32 for (size_t i = 0; i < observers_.size(); ++i) |
| 33 DCHECK(observers_[i].layer != layer); | 33 DCHECK(observers_[i].layer != layer); |
| 34 #endif | 34 #endif |
| 35 | 35 |
| 36 observers_.push_back(Observer(layer, gfx::RectF(frame_size_))); | 36 observers_.push_back(Observer(layer, gfx::Rect(frame_size_))); |
| 37 | 37 |
| 38 DCHECK(frame_) << "Must have a frame when given to a DelegatedRendererLayer."; | 38 DCHECK(frame_) << "Must have a frame when given to a DelegatedRendererLayer."; |
| 39 } | 39 } |
| 40 | 40 |
| 41 void DelegatedFrameProvider::RemoveObserver(DelegatedRendererLayer* layer) { | 41 void DelegatedFrameProvider::RemoveObserver(DelegatedRendererLayer* layer) { |
| 42 bool found_observer = false; | 42 bool found_observer = false; |
| 43 for (size_t i = 0; i < observers_.size(); ++i) { | 43 for (size_t i = 0; i < observers_.size(); ++i) { |
| 44 if (observers_[i].layer != layer) | 44 if (observers_[i].layer != layer) |
| 45 continue; | 45 continue; |
| 46 observers_.erase(observers_.begin() + i); | 46 observers_.erase(observers_.begin() + i); |
| (...skipping 26 matching lines...) Expand all Loading... |
| 73 | 73 |
| 74 for (size_t i = 0; i < observers_.size(); ++i) { | 74 for (size_t i = 0; i < observers_.size(); ++i) { |
| 75 observers_[i].damage = | 75 observers_[i].damage = |
| 76 gfx::UnionRects(observers_[i].damage, root_pass->damage_rect); | 76 gfx::UnionRects(observers_[i].damage, root_pass->damage_rect); |
| 77 observers_[i].layer->ProviderHasNewFrame(); | 77 observers_[i].layer->ProviderHasNewFrame(); |
| 78 } | 78 } |
| 79 } | 79 } |
| 80 | 80 |
| 81 DelegatedFrameData* DelegatedFrameProvider::GetFrameDataAndRefResources( | 81 DelegatedFrameData* DelegatedFrameProvider::GetFrameDataAndRefResources( |
| 82 DelegatedRendererLayer* observer, | 82 DelegatedRendererLayer* observer, |
| 83 gfx::RectF* damage) { | 83 gfx::Rect* damage) { |
| 84 | |
| 85 bool found_observer = false; | 84 bool found_observer = false; |
| 86 for (size_t i = 0; i < observers_.size(); ++i) { | 85 for (size_t i = 0; i < observers_.size(); ++i) { |
| 87 if (observers_[i].layer != observer) | 86 if (observers_[i].layer != observer) |
| 88 continue; | 87 continue; |
| 89 *damage = observers_[i].damage; | 88 *damage = observers_[i].damage; |
| 90 // The observer is now responsible for the damage. | 89 // The observer is now responsible for the damage. |
| 91 observers_[i].damage = gfx::RectF(); | 90 observers_[i].damage = gfx::Rect(); |
| 92 found_observer = true; | 91 found_observer = true; |
| 93 } | 92 } |
| 94 DCHECK(found_observer); | 93 DCHECK(found_observer); |
| 95 | 94 |
| 96 resource_collection_->RefResources(frame_->resource_list); | 95 resource_collection_->RefResources(frame_->resource_list); |
| 97 return frame_.get(); | 96 return frame_.get(); |
| 98 } | 97 } |
| 99 | 98 |
| 100 ReturnCallback | 99 ReturnCallback |
| 101 DelegatedFrameProvider::GetReturnResourcesCallbackForImplThread() { | 100 DelegatedFrameProvider::GetReturnResourcesCallbackForImplThread() { |
| 102 return resource_collection_->GetReturnResourcesCallbackForImplThread(); | 101 return resource_collection_->GetReturnResourcesCallbackForImplThread(); |
| 103 } | 102 } |
| 104 | 103 |
| 105 void DelegatedFrameProvider::UnrefResourcesOnMainThread( | 104 void DelegatedFrameProvider::UnrefResourcesOnMainThread( |
| 106 const ReturnedResourceArray& returned) { | 105 const ReturnedResourceArray& returned) { |
| 107 resource_collection_->UnrefResources(returned); | 106 resource_collection_->UnrefResources(returned); |
| 108 } | 107 } |
| 109 | 108 |
| 110 } // namespace cc | 109 } // namespace cc |
| OLD | NEW |