Chromium Code Reviews| 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 754 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 765 if (!page_scale_layer && root_scroll) | 765 if (!page_scale_layer && root_scroll) |
| 766 page_scale_layer = root_scroll->parent(); | 766 page_scale_layer = root_scroll->parent(); |
| 767 | 767 |
| 768 if (hud_layer_) { | 768 if (hud_layer_) { |
| 769 hud_layer_->PrepareForCalculateDrawProperties( | 769 hud_layer_->PrepareForCalculateDrawProperties( |
| 770 device_viewport_size(), device_scale_factor_); | 770 device_viewport_size(), device_scale_factor_); |
| 771 } | 771 } |
| 772 | 772 |
| 773 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::CalcDrawProps"); | 773 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::CalcDrawProps"); |
| 774 bool can_render_to_separate_surface = true; | 774 bool can_render_to_separate_surface = true; |
| 775 // TODO(vmpstr): Passing 0 as the current calculate properties number means | |
| 776 // that we won't be able to detect if a layer is part of |update_list|. | |
| 777 // Change this if this information is required. | |
| 775 LayerTreeHostCommon::CalcDrawPropsMainInputs inputs( | 778 LayerTreeHostCommon::CalcDrawPropsMainInputs inputs( |
| 776 root_layer, | 779 root_layer, |
| 777 device_viewport_size(), | 780 device_viewport_size(), |
| 778 gfx::Transform(), | 781 gfx::Transform(), |
| 779 device_scale_factor_, | 782 device_scale_factor_, |
| 780 page_scale_factor_, | 783 page_scale_factor_, |
| 781 page_scale_layer, | 784 page_scale_layer, |
| 782 GetRendererCapabilities().max_texture_size, | 785 GetRendererCapabilities().max_texture_size, |
| 783 settings_.can_use_lcd_text, | 786 settings_.can_use_lcd_text, |
| 784 can_render_to_separate_surface, | 787 can_render_to_separate_surface, |
| 785 settings_.layer_transforms_should_scale_layer_contents, | 788 settings_.layer_transforms_should_scale_layer_contents, |
| 786 &update_list); | 789 &update_list, |
| 790 0); | |
|
danakj
2014/05/05 19:25:41
can you put this in a temp var to give it a name?
vmpstr
2014/05/05 20:50:34
Done.
| |
| 787 LayerTreeHostCommon::CalculateDrawProperties(&inputs); | 791 LayerTreeHostCommon::CalculateDrawProperties(&inputs); |
| 788 | 792 |
| 789 if (total_frames_used_for_lcd_text_metrics_ <= | 793 if (total_frames_used_for_lcd_text_metrics_ <= |
| 790 kTotalFramesToUseForLCDTextMetrics) { | 794 kTotalFramesToUseForLCDTextMetrics) { |
| 791 LayerTreeHostCommon::CallFunctionForSubtree( | 795 LayerTreeHostCommon::CallFunctionForSubtree( |
| 792 root_layer, | 796 root_layer, |
| 793 base::Bind(&LayerTreeHost::CalculateLCDTextMetricsCallback, | 797 base::Bind(&LayerTreeHost::CalculateLCDTextMetricsCallback, |
| 794 base::Unretained(this))); | 798 base::Unretained(this))); |
| 795 total_frames_used_for_lcd_text_metrics_++; | 799 total_frames_used_for_lcd_text_metrics_++; |
| 796 } | 800 } |
| (...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1232 swap_promise_list_.push_back(swap_promise.Pass()); | 1236 swap_promise_list_.push_back(swap_promise.Pass()); |
| 1233 } | 1237 } |
| 1234 | 1238 |
| 1235 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) { | 1239 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) { |
| 1236 for (size_t i = 0; i < swap_promise_list_.size(); i++) | 1240 for (size_t i = 0; i < swap_promise_list_.size(); i++) |
| 1237 swap_promise_list_[i]->DidNotSwap(reason); | 1241 swap_promise_list_[i]->DidNotSwap(reason); |
| 1238 swap_promise_list_.clear(); | 1242 swap_promise_list_.clear(); |
| 1239 } | 1243 } |
| 1240 | 1244 |
| 1241 } // namespace cc | 1245 } // namespace cc |
| OLD | NEW |