| 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 999 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1010 content_is_suitable_for_gpu_rasterization_ &= | 1010 content_is_suitable_for_gpu_rasterization_ &= |
| 1011 it->IsSuitableForGpuRasterization(); | 1011 it->IsSuitableForGpuRasterization(); |
| 1012 } | 1012 } |
| 1013 | 1013 |
| 1014 occlusion_tracker.LeaveLayer(it); | 1014 occlusion_tracker.LeaveLayer(it); |
| 1015 } | 1015 } |
| 1016 | 1016 |
| 1017 in_paint_layer_contents_ = false; | 1017 in_paint_layer_contents_ = false; |
| 1018 } | 1018 } |
| 1019 | 1019 |
| 1020 void LayerTreeHost::ApplyScrollAndScale(const ScrollAndScaleSet& info) { | 1020 void LayerTreeHost::ApplyScrollAndScale(ScrollAndScaleSet* info) { |
| 1021 if (!root_layer_.get()) | 1021 if (!root_layer_.get()) |
| 1022 return; | 1022 return; |
| 1023 | 1023 |
| 1024 ScopedPtrVector<SwapPromise>::iterator it = info->swap_promises.begin(); |
| 1025 for (; it != info->swap_promises.end(); ++it) { |
| 1026 scoped_ptr<SwapPromise> swap_promise(info->swap_promises.take(it)); |
| 1027 TRACE_EVENT_FLOW_STEP0("input", |
| 1028 "LatencyInfo.Flow", |
| 1029 TRACE_ID_DONT_MANGLE(swap_promise->TraceId()), |
| 1030 "Main thread scroll update"); |
| 1031 QueueSwapPromise(swap_promise.Pass()); |
| 1032 } |
| 1033 |
| 1024 gfx::Vector2d inner_viewport_scroll_delta; | 1034 gfx::Vector2d inner_viewport_scroll_delta; |
| 1025 gfx::Vector2d outer_viewport_scroll_delta; | 1035 gfx::Vector2d outer_viewport_scroll_delta; |
| 1026 | 1036 |
| 1027 for (size_t i = 0; i < info.scrolls.size(); ++i) { | 1037 for (size_t i = 0; i < info->scrolls.size(); ++i) { |
| 1028 Layer* layer = | 1038 Layer* layer = LayerTreeHostCommon::FindLayerInSubtree( |
| 1029 LayerTreeHostCommon::FindLayerInSubtree(root_layer_.get(), | 1039 root_layer_.get(), info->scrolls[i].layer_id); |
| 1030 info.scrolls[i].layer_id); | |
| 1031 if (!layer) | 1040 if (!layer) |
| 1032 continue; | 1041 continue; |
| 1033 if (layer == outer_viewport_scroll_layer_.get()) { | 1042 if (layer == outer_viewport_scroll_layer_.get()) { |
| 1034 outer_viewport_scroll_delta += info.scrolls[i].scroll_delta; | 1043 outer_viewport_scroll_delta += info->scrolls[i].scroll_delta; |
| 1035 } else if (layer == inner_viewport_scroll_layer_.get()) { | 1044 } else if (layer == inner_viewport_scroll_layer_.get()) { |
| 1036 inner_viewport_scroll_delta += info.scrolls[i].scroll_delta; | 1045 inner_viewport_scroll_delta += info->scrolls[i].scroll_delta; |
| 1037 } else { | 1046 } else { |
| 1038 layer->SetScrollOffsetFromImplSide(layer->scroll_offset() + | 1047 layer->SetScrollOffsetFromImplSide(layer->scroll_offset() + |
| 1039 info.scrolls[i].scroll_delta); | 1048 info->scrolls[i].scroll_delta); |
| 1040 } | 1049 } |
| 1041 } | 1050 } |
| 1042 | 1051 |
| 1043 if (!inner_viewport_scroll_delta.IsZero() || | 1052 if (!inner_viewport_scroll_delta.IsZero() || |
| 1044 !outer_viewport_scroll_delta.IsZero() || info.page_scale_delta != 1.f) { | 1053 !outer_viewport_scroll_delta.IsZero() || info->page_scale_delta != 1.f) { |
| 1045 // SetScrollOffsetFromImplSide above could have destroyed the tree, | 1054 // SetScrollOffsetFromImplSide above could have destroyed the tree, |
| 1046 // so re-get this layer before doing anything to it. | 1055 // so re-get this layer before doing anything to it. |
| 1047 | 1056 |
| 1048 // Preemptively apply the scroll offset and scale delta here before sending | 1057 // Preemptively apply the scroll offset and scale delta here before sending |
| 1049 // it to the client. If the client comes back and sets it to the same | 1058 // it to the client. If the client comes back and sets it to the same |
| 1050 // value, then the layer can early out without needing a full commit. | 1059 // value, then the layer can early out without needing a full commit. |
| 1051 DCHECK(inner_viewport_scroll_layer_); // We should always have this. | 1060 DCHECK(inner_viewport_scroll_layer_); // We should always have this. |
| 1052 | 1061 |
| 1053 inner_viewport_scroll_layer_->SetScrollOffsetFromImplSide( | 1062 inner_viewport_scroll_layer_->SetScrollOffsetFromImplSide( |
| 1054 inner_viewport_scroll_layer_->scroll_offset() + | 1063 inner_viewport_scroll_layer_->scroll_offset() + |
| 1055 inner_viewport_scroll_delta); | 1064 inner_viewport_scroll_delta); |
| 1056 if (outer_viewport_scroll_layer_) { | 1065 if (outer_viewport_scroll_layer_) { |
| 1057 outer_viewport_scroll_layer_->SetScrollOffsetFromImplSide( | 1066 outer_viewport_scroll_layer_->SetScrollOffsetFromImplSide( |
| 1058 outer_viewport_scroll_layer_->scroll_offset() + | 1067 outer_viewport_scroll_layer_->scroll_offset() + |
| 1059 outer_viewport_scroll_delta); | 1068 outer_viewport_scroll_delta); |
| 1060 } | 1069 } |
| 1061 ApplyPageScaleDeltaFromImplSide(info.page_scale_delta); | 1070 ApplyPageScaleDeltaFromImplSide(info->page_scale_delta); |
| 1062 | 1071 |
| 1063 client_->ApplyScrollAndScale( | 1072 client_->ApplyScrollAndScale( |
| 1064 inner_viewport_scroll_delta + outer_viewport_scroll_delta, | 1073 inner_viewport_scroll_delta + outer_viewport_scroll_delta, |
| 1065 info.page_scale_delta); | 1074 info->page_scale_delta); |
| 1066 } | 1075 } |
| 1067 } | 1076 } |
| 1068 | 1077 |
| 1069 void LayerTreeHost::StartRateLimiter() { | 1078 void LayerTreeHost::StartRateLimiter() { |
| 1070 if (animating_) | 1079 if (animating_) |
| 1071 return; | 1080 return; |
| 1072 | 1081 |
| 1073 if (!rate_limit_timer_.IsRunning()) { | 1082 if (!rate_limit_timer_.IsRunning()) { |
| 1074 rate_limit_timer_.Start(FROM_HERE, | 1083 rate_limit_timer_.Start(FROM_HERE, |
| 1075 base::TimeDelta(), | 1084 base::TimeDelta(), |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1272 swap_promise_list_.push_back(swap_promise.Pass()); | 1281 swap_promise_list_.push_back(swap_promise.Pass()); |
| 1273 } | 1282 } |
| 1274 | 1283 |
| 1275 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) { | 1284 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) { |
| 1276 for (size_t i = 0; i < swap_promise_list_.size(); i++) | 1285 for (size_t i = 0; i < swap_promise_list_.size(); i++) |
| 1277 swap_promise_list_[i]->DidNotSwap(reason); | 1286 swap_promise_list_[i]->DidNotSwap(reason); |
| 1278 swap_promise_list_.clear(); | 1287 swap_promise_list_.clear(); |
| 1279 } | 1288 } |
| 1280 | 1289 |
| 1281 } // namespace cc | 1290 } // namespace cc |
| OLD | NEW |