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 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 918 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
929 metadata.page_scale_factor = active_tree_->total_page_scale_factor(); | 929 metadata.page_scale_factor = active_tree_->total_page_scale_factor(); |
930 metadata.viewport_size = active_tree_->ScrollableViewportSize(); | 930 metadata.viewport_size = active_tree_->ScrollableViewportSize(); |
931 metadata.root_layer_size = active_tree_->ScrollableSize(); | 931 metadata.root_layer_size = active_tree_->ScrollableSize(); |
932 metadata.min_page_scale_factor = active_tree_->min_page_scale_factor(); | 932 metadata.min_page_scale_factor = active_tree_->min_page_scale_factor(); |
933 metadata.max_page_scale_factor = active_tree_->max_page_scale_factor(); | 933 metadata.max_page_scale_factor = active_tree_->max_page_scale_factor(); |
934 if (top_controls_manager_) { | 934 if (top_controls_manager_) { |
935 metadata.location_bar_offset = | 935 metadata.location_bar_offset = |
936 gfx::Vector2dF(0.f, top_controls_manager_->controls_top_offset()); | 936 gfx::Vector2dF(0.f, top_controls_manager_->controls_top_offset()); |
937 metadata.location_bar_content_translation = | 937 metadata.location_bar_content_translation = |
938 gfx::Vector2dF(0.f, top_controls_manager_->content_top_offset()); | 938 gfx::Vector2dF(0.f, top_controls_manager_->content_top_offset()); |
| 939 metadata.overdraw_bottom_height = overdraw_bottom_height_; |
939 } | 940 } |
940 | 941 |
941 if (!RootScrollLayer()) | 942 if (!RootScrollLayer()) |
942 return metadata; | 943 return metadata; |
943 | 944 |
944 metadata.root_scroll_offset = RootScrollLayer()->TotalScrollOffset(); | 945 metadata.root_scroll_offset = RootScrollLayer()->TotalScrollOffset(); |
945 | 946 |
946 return metadata; | 947 return metadata; |
947 } | 948 } |
948 | 949 |
(...skipping 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1975 debug_state_ = debug_state; | 1976 debug_state_ = debug_state; |
1976 } | 1977 } |
1977 | 1978 |
1978 void LayerTreeHostImpl::SavePaintTime(const base::TimeDelta& total_paint_time, | 1979 void LayerTreeHostImpl::SavePaintTime(const base::TimeDelta& total_paint_time, |
1979 int commit_number) { | 1980 int commit_number) { |
1980 DCHECK(debug_state_.continuous_painting); | 1981 DCHECK(debug_state_.continuous_painting); |
1981 paint_time_counter_->SavePaintTime(total_paint_time, commit_number); | 1982 paint_time_counter_->SavePaintTime(total_paint_time, commit_number); |
1982 } | 1983 } |
1983 | 1984 |
1984 } // namespace cc | 1985 } // namespace cc |
OLD | NEW |