| 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.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <stack> | 8 #include <stack> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 801 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 812 &update_layer_list); | 812 &update_layer_list); |
| 813 } | 813 } |
| 814 | 814 |
| 815 for (const auto& layer : update_layer_list) | 815 for (const auto& layer : update_layer_list) |
| 816 layer->SavePaintProperties(); | 816 layer->SavePaintProperties(); |
| 817 | 817 |
| 818 base::AutoReset<bool> painting(&in_paint_layer_contents_, true); | 818 base::AutoReset<bool> painting(&in_paint_layer_contents_, true); |
| 819 bool did_paint_content = false; | 819 bool did_paint_content = false; |
| 820 for (const auto& layer : update_layer_list) { | 820 for (const auto& layer : update_layer_list) { |
| 821 // TODO(enne): temporarily clobber draw properties visible rect. | 821 // TODO(enne): temporarily clobber draw properties visible rect. |
| 822 layer->draw_properties().visible_content_rect = | 822 layer->draw_properties().visible_layer_rect = |
| 823 layer->visible_rect_from_property_trees(); | 823 layer->visible_rect_from_property_trees(); |
| 824 did_paint_content |= layer->Update(queue); | 824 did_paint_content |= layer->Update(queue); |
| 825 content_is_suitable_for_gpu_rasterization_ &= | 825 content_is_suitable_for_gpu_rasterization_ &= |
| 826 layer->IsSuitableForGpuRasterization(); | 826 layer->IsSuitableForGpuRasterization(); |
| 827 } | 827 } |
| 828 return did_paint_content; | 828 return did_paint_content; |
| 829 } | 829 } |
| 830 | 830 |
| 831 void LayerTreeHost::ReduceMemoryUsage() { | 831 void LayerTreeHost::ReduceMemoryUsage() { |
| 832 if (!root_layer()) | 832 if (!root_layer()) |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1117 } | 1117 } |
| 1118 | 1118 |
| 1119 void LayerTreeHost::RecordFrameTimingEvents( | 1119 void LayerTreeHost::RecordFrameTimingEvents( |
| 1120 scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events, | 1120 scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events, |
| 1121 scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) { | 1121 scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) { |
| 1122 client_->RecordFrameTimingEvents(composite_events.Pass(), | 1122 client_->RecordFrameTimingEvents(composite_events.Pass(), |
| 1123 main_frame_events.Pass()); | 1123 main_frame_events.Pass()); |
| 1124 } | 1124 } |
| 1125 | 1125 |
| 1126 } // namespace cc | 1126 } // namespace cc |
| OLD | NEW |