| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/trees/layer_tree_host_impl.h" | 5 #include "cc/trees/layer_tree_host_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 745 LayerIteratorType::Begin(frame->render_surface_layer_list); | 745 LayerIteratorType::Begin(frame->render_surface_layer_list); |
| 746 it != end; | 746 it != end; |
| 747 ++it) { | 747 ++it) { |
| 748 RenderPassId target_render_pass_id = | 748 RenderPassId target_render_pass_id = |
| 749 it.target_render_surface_layer()->render_surface()->GetRenderPassId(); | 749 it.target_render_surface_layer()->render_surface()->GetRenderPassId(); |
| 750 RenderPass* target_render_pass = | 750 RenderPass* target_render_pass = |
| 751 frame->render_passes_by_id[target_render_pass_id]; | 751 frame->render_passes_by_id[target_render_pass_id]; |
| 752 | 752 |
| 753 occlusion_tracker.EnterLayer(it); | 753 occlusion_tracker.EnterLayer(it); |
| 754 | 754 |
| 755 AppendQuadsData append_quads_data(target_render_pass_id); | 755 AppendQuadsData append_quads_data; |
| 756 | 756 |
| 757 if (it.represents_target_render_surface()) { | 757 if (it.represents_target_render_surface()) { |
| 758 if (it->HasCopyRequest()) { | 758 if (it->HasCopyRequest()) { |
| 759 have_copy_request = true; | 759 have_copy_request = true; |
| 760 it->TakeCopyRequestsAndTransformToTarget( | 760 it->TakeCopyRequestsAndTransformToTarget( |
| 761 &target_render_pass->copy_requests); | 761 &target_render_pass->copy_requests); |
| 762 } | 762 } |
| 763 } else if (it.represents_contributing_render_surface() && | 763 } else if (it.represents_contributing_render_surface() && |
| 764 it->render_surface()->contributes_to_drawn_surface()) { | 764 it->render_surface()->contributes_to_drawn_surface()) { |
| 765 RenderPassId contributing_render_pass_id = | 765 RenderPassId contributing_render_pass_id = |
| (...skipping 16 matching lines...) Expand all Loading... |
| 782 frame->will_draw_layers.push_back(*it); | 782 frame->will_draw_layers.push_back(*it); |
| 783 | 783 |
| 784 if (it->HasContributingDelegatedRenderPasses()) { | 784 if (it->HasContributingDelegatedRenderPasses()) { |
| 785 RenderPassId contributing_render_pass_id = | 785 RenderPassId contributing_render_pass_id = |
| 786 it->FirstContributingRenderPassId(); | 786 it->FirstContributingRenderPassId(); |
| 787 while (frame->render_passes_by_id.find(contributing_render_pass_id) != | 787 while (frame->render_passes_by_id.find(contributing_render_pass_id) != |
| 788 frame->render_passes_by_id.end()) { | 788 frame->render_passes_by_id.end()) { |
| 789 RenderPass* render_pass = | 789 RenderPass* render_pass = |
| 790 frame->render_passes_by_id[contributing_render_pass_id]; | 790 frame->render_passes_by_id[contributing_render_pass_id]; |
| 791 | 791 |
| 792 AppendQuadsData append_quads_data(render_pass->id); | |
| 793 AppendQuadsForLayer(render_pass, | 792 AppendQuadsForLayer(render_pass, |
| 794 *it, | 793 *it, |
| 795 occlusion_tracker, | 794 occlusion_tracker, |
| 796 &append_quads_data); | 795 &append_quads_data); |
| 797 | 796 |
| 798 contributing_render_pass_id = | 797 contributing_render_pass_id = |
| 799 it->NextContributingRenderPassId(contributing_render_pass_id); | 798 it->NextContributingRenderPassId(contributing_render_pass_id); |
| 800 } | 799 } |
| 801 } | 800 } |
| 802 | 801 |
| (...skipping 2651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3454 } | 3453 } |
| 3455 | 3454 |
| 3456 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { | 3455 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { |
| 3457 std::vector<PictureLayerImpl*>::iterator it = | 3456 std::vector<PictureLayerImpl*>::iterator it = |
| 3458 std::find(picture_layers_.begin(), picture_layers_.end(), layer); | 3457 std::find(picture_layers_.begin(), picture_layers_.end(), layer); |
| 3459 DCHECK(it != picture_layers_.end()); | 3458 DCHECK(it != picture_layers_.end()); |
| 3460 picture_layers_.erase(it); | 3459 picture_layers_.erase(it); |
| 3461 } | 3460 } |
| 3462 | 3461 |
| 3463 } // namespace cc | 3462 } // namespace cc |
| OLD | NEW |