| 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 1018 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1029 content_is_suitable_for_gpu_rasterization_ &= | 1029 content_is_suitable_for_gpu_rasterization_ &= |
| 1030 it->IsSuitableForGpuRasterization(); | 1030 it->IsSuitableForGpuRasterization(); |
| 1031 } | 1031 } |
| 1032 | 1032 |
| 1033 occlusion_tracker.LeaveLayer(it); | 1033 occlusion_tracker.LeaveLayer(it); |
| 1034 } | 1034 } |
| 1035 | 1035 |
| 1036 in_paint_layer_contents_ = false; | 1036 in_paint_layer_contents_ = false; |
| 1037 } | 1037 } |
| 1038 | 1038 |
| 1039 void LayerTreeHost::ApplyScrollAndScale(const ScrollAndScaleSet& info) { | 1039 void LayerTreeHost::ApplyScrollAndScale(ScrollAndScaleSet* info) { |
| 1040 if (!root_layer_.get()) | 1040 if (!root_layer_.get()) |
| 1041 return; | 1041 return; |
| 1042 | 1042 |
| 1043 ScopedPtrVector<SwapPromise>::iterator it = info->swap_promises.begin(); |
| 1044 for (; it != info->swap_promises.end(); ++it) { |
| 1045 scoped_ptr<SwapPromise> swap_promise(info->swap_promises.take(it)); |
| 1046 TRACE_EVENT_FLOW_STEP0("input", |
| 1047 "LatencyInfo.Flow", |
| 1048 TRACE_ID_DONT_MANGLE(swap_promise->TraceId()), |
| 1049 "Main thread scroll update"); |
| 1050 QueueSwapPromise(swap_promise.Pass()); |
| 1051 } |
| 1052 |
| 1043 gfx::Vector2d inner_viewport_scroll_delta; | 1053 gfx::Vector2d inner_viewport_scroll_delta; |
| 1044 gfx::Vector2d outer_viewport_scroll_delta; | 1054 gfx::Vector2d outer_viewport_scroll_delta; |
| 1045 | 1055 |
| 1046 for (size_t i = 0; i < info.scrolls.size(); ++i) { | 1056 for (size_t i = 0; i < info->scrolls.size(); ++i) { |
| 1047 Layer* layer = | 1057 Layer* layer = LayerTreeHostCommon::FindLayerInSubtree( |
| 1048 LayerTreeHostCommon::FindLayerInSubtree(root_layer_.get(), | 1058 root_layer_.get(), info->scrolls[i].layer_id); |
| 1049 info.scrolls[i].layer_id); | |
| 1050 if (!layer) | 1059 if (!layer) |
| 1051 continue; | 1060 continue; |
| 1052 if (layer == outer_viewport_scroll_layer_.get()) { | 1061 if (layer == outer_viewport_scroll_layer_.get()) { |
| 1053 outer_viewport_scroll_delta += info.scrolls[i].scroll_delta; | 1062 outer_viewport_scroll_delta += info->scrolls[i].scroll_delta; |
| 1054 } else if (layer == inner_viewport_scroll_layer_.get()) { | 1063 } else if (layer == inner_viewport_scroll_layer_.get()) { |
| 1055 inner_viewport_scroll_delta += info.scrolls[i].scroll_delta; | 1064 inner_viewport_scroll_delta += info->scrolls[i].scroll_delta; |
| 1056 } else { | 1065 } else { |
| 1057 layer->SetScrollOffsetFromImplSide(layer->scroll_offset() + | 1066 layer->SetScrollOffsetFromImplSide(layer->scroll_offset() + |
| 1058 info.scrolls[i].scroll_delta); | 1067 info->scrolls[i].scroll_delta); |
| 1059 } | 1068 } |
| 1060 } | 1069 } |
| 1061 | 1070 |
| 1062 if (!inner_viewport_scroll_delta.IsZero() || | 1071 if (!inner_viewport_scroll_delta.IsZero() || |
| 1063 !outer_viewport_scroll_delta.IsZero() || info.page_scale_delta != 1.f) { | 1072 !outer_viewport_scroll_delta.IsZero() || info->page_scale_delta != 1.f) { |
| 1064 // SetScrollOffsetFromImplSide above could have destroyed the tree, | 1073 // SetScrollOffsetFromImplSide above could have destroyed the tree, |
| 1065 // so re-get this layer before doing anything to it. | 1074 // so re-get this layer before doing anything to it. |
| 1066 | 1075 |
| 1067 // Preemptively apply the scroll offset and scale delta here before sending | 1076 // Preemptively apply the scroll offset and scale delta here before sending |
| 1068 // it to the client. If the client comes back and sets it to the same | 1077 // it to the client. If the client comes back and sets it to the same |
| 1069 // value, then the layer can early out without needing a full commit. | 1078 // value, then the layer can early out without needing a full commit. |
| 1070 DCHECK(inner_viewport_scroll_layer_); // We should always have this. | 1079 DCHECK(inner_viewport_scroll_layer_); // We should always have this. |
| 1071 | 1080 |
| 1072 inner_viewport_scroll_layer_->SetScrollOffsetFromImplSide( | 1081 inner_viewport_scroll_layer_->SetScrollOffsetFromImplSide( |
| 1073 inner_viewport_scroll_layer_->scroll_offset() + | 1082 inner_viewport_scroll_layer_->scroll_offset() + |
| 1074 inner_viewport_scroll_delta); | 1083 inner_viewport_scroll_delta); |
| 1075 if (outer_viewport_scroll_layer_) { | 1084 if (outer_viewport_scroll_layer_) { |
| 1076 outer_viewport_scroll_layer_->SetScrollOffsetFromImplSide( | 1085 outer_viewport_scroll_layer_->SetScrollOffsetFromImplSide( |
| 1077 outer_viewport_scroll_layer_->scroll_offset() + | 1086 outer_viewport_scroll_layer_->scroll_offset() + |
| 1078 outer_viewport_scroll_delta); | 1087 outer_viewport_scroll_delta); |
| 1079 } | 1088 } |
| 1080 ApplyPageScaleDeltaFromImplSide(info.page_scale_delta); | 1089 ApplyPageScaleDeltaFromImplSide(info->page_scale_delta); |
| 1081 | 1090 |
| 1082 client_->ApplyScrollAndScale( | 1091 client_->ApplyScrollAndScale( |
| 1083 inner_viewport_scroll_delta + outer_viewport_scroll_delta, | 1092 inner_viewport_scroll_delta + outer_viewport_scroll_delta, |
| 1084 info.page_scale_delta); | 1093 info->page_scale_delta); |
| 1085 } | 1094 } |
| 1086 } | 1095 } |
| 1087 | 1096 |
| 1088 void LayerTreeHost::StartRateLimiter() { | 1097 void LayerTreeHost::StartRateLimiter() { |
| 1089 if (animating_) | 1098 if (animating_) |
| 1090 return; | 1099 return; |
| 1091 | 1100 |
| 1092 if (!rate_limit_timer_.IsRunning()) { | 1101 if (!rate_limit_timer_.IsRunning()) { |
| 1093 rate_limit_timer_.Start(FROM_HERE, | 1102 rate_limit_timer_.Start(FROM_HERE, |
| 1094 base::TimeDelta(), | 1103 base::TimeDelta(), |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1289 swap_promise_list_.push_back(swap_promise.Pass()); | 1298 swap_promise_list_.push_back(swap_promise.Pass()); |
| 1290 } | 1299 } |
| 1291 | 1300 |
| 1292 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) { | 1301 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) { |
| 1293 for (size_t i = 0; i < swap_promise_list_.size(); i++) | 1302 for (size_t i = 0; i < swap_promise_list_.size(); i++) |
| 1294 swap_promise_list_[i]->DidNotSwap(reason); | 1303 swap_promise_list_[i]->DidNotSwap(reason); |
| 1295 swap_promise_list_.clear(); | 1304 swap_promise_list_.clear(); |
| 1296 } | 1305 } |
| 1297 | 1306 |
| 1298 } // namespace cc | 1307 } // namespace cc |
| OLD | NEW |