| 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 853 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 864 } | 864 } |
| 865 | 865 |
| 866 rendering_stats_instrumentation_->AddVisibleContentArea( | 866 rendering_stats_instrumentation_->AddVisibleContentArea( |
| 867 append_quads_data.visible_content_area); | 867 append_quads_data.visible_content_area); |
| 868 rendering_stats_instrumentation_->AddApproximatedVisibleContentArea( | 868 rendering_stats_instrumentation_->AddApproximatedVisibleContentArea( |
| 869 append_quads_data.approximated_visible_content_area); | 869 append_quads_data.approximated_visible_content_area); |
| 870 | 870 |
| 871 num_missing_tiles += append_quads_data.num_missing_tiles; | 871 num_missing_tiles += append_quads_data.num_missing_tiles; |
| 872 num_incomplete_tiles += append_quads_data.num_incomplete_tiles; | 872 num_incomplete_tiles += append_quads_data.num_incomplete_tiles; |
| 873 | 873 |
| 874 if (append_quads_data.num_missing_tiles) { | 874 if (append_quads_data.num_missing_tiles_inside_activation_rect) { |
| 875 bool layer_has_animating_transform = | 875 bool layer_has_animating_transform = |
| 876 it->screen_space_transform_is_animating() || | 876 it->screen_space_transform_is_animating() || |
| 877 it->draw_transform_is_animating(); | 877 it->draw_transform_is_animating(); |
| 878 if (layer_has_animating_transform) | 878 if (layer_has_animating_transform) |
| 879 draw_result = DRAW_ABORTED_CHECKERBOARD_ANIMATIONS; | 879 draw_result = DRAW_ABORTED_CHECKERBOARD_ANIMATIONS; |
| 880 } | 880 } |
| 881 | 881 |
| 882 if (append_quads_data.num_incomplete_tiles || | 882 if (append_quads_data.num_incomplete_tiles_inside_activation_rect || |
| 883 append_quads_data.num_missing_tiles) { | 883 append_quads_data.num_missing_tiles_inside_activation_rect) { |
| 884 frame->contains_incomplete_tile = true; | 884 frame->contains_incomplete_tile = true; |
| 885 if (active_tree()->RequiresHighResToDraw()) | 885 if (active_tree()->RequiresHighResToDraw()) |
| 886 draw_result = DRAW_ABORTED_MISSING_HIGH_RES_CONTENT; | 886 draw_result = DRAW_ABORTED_MISSING_HIGH_RES_CONTENT; |
| 887 } | 887 } |
| 888 | 888 |
| 889 occlusion_tracker.LeaveLayer(it); | 889 occlusion_tracker.LeaveLayer(it); |
| 890 } | 890 } |
| 891 | 891 |
| 892 if (have_copy_request || | 892 if (have_copy_request || |
| 893 output_surface_->capabilities().draw_and_swap_full_viewport_every_frame) | 893 output_surface_->capabilities().draw_and_swap_full_viewport_every_frame) |
| (...skipping 2512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3406 } | 3406 } |
| 3407 | 3407 |
| 3408 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { | 3408 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { |
| 3409 std::vector<PictureLayerImpl*>::iterator it = | 3409 std::vector<PictureLayerImpl*>::iterator it = |
| 3410 std::find(picture_layers_.begin(), picture_layers_.end(), layer); | 3410 std::find(picture_layers_.begin(), picture_layers_.end(), layer); |
| 3411 DCHECK(it != picture_layers_.end()); | 3411 DCHECK(it != picture_layers_.end()); |
| 3412 picture_layers_.erase(it); | 3412 picture_layers_.erase(it); |
| 3413 } | 3413 } |
| 3414 | 3414 |
| 3415 } // namespace cc | 3415 } // namespace cc |
| OLD | NEW |