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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
325 LayerImpl* hud_impl = LayerTreeHostCommon::FindLayerInSubtree( | 325 LayerImpl* hud_impl = LayerTreeHostCommon::FindLayerInSubtree( |
326 sync_tree->root_layer(), hud_layer_->id()); | 326 sync_tree->root_layer(), hud_layer_->id()); |
327 sync_tree->set_hud_layer(static_cast<HeadsUpDisplayLayerImpl*>(hud_impl)); | 327 sync_tree->set_hud_layer(static_cast<HeadsUpDisplayLayerImpl*>(hud_impl)); |
328 } else { | 328 } else { |
329 sync_tree->set_hud_layer(NULL); | 329 sync_tree->set_hud_layer(NULL); |
330 } | 330 } |
331 | 331 |
332 sync_tree->set_background_color(background_color_); | 332 sync_tree->set_background_color(background_color_); |
333 sync_tree->set_has_transparent_background(has_transparent_background_); | 333 sync_tree->set_has_transparent_background(has_transparent_background_); |
334 | 334 |
335 sync_tree->FindRootScrollLayer(); | 335 if (page_scale_layer_ && inner_viewport_scroll_layer_) { |
336 | |
337 // TODO(wjmaclean) For now, not all LTH clients will register viewports, so | |
338 // only set them when available.. | |
339 if (page_scale_layer_) { | |
340 DCHECK(inner_viewport_scroll_layer_); | |
341 sync_tree->SetViewportLayersFromIds( | 336 sync_tree->SetViewportLayersFromIds( |
342 page_scale_layer_->id(), | 337 page_scale_layer_->id(), |
343 inner_viewport_scroll_layer_->id(), | 338 inner_viewport_scroll_layer_->id(), |
344 outer_viewport_scroll_layer_ ? outer_viewport_scroll_layer_->id() | 339 outer_viewport_scroll_layer_ ? outer_viewport_scroll_layer_->id() |
345 : Layer::INVALID_ID); | 340 : Layer::INVALID_ID); |
346 } else { | 341 } else { |
347 sync_tree->ClearViewportLayers(); | 342 sync_tree->ClearViewportLayers(); |
348 } | 343 } |
349 | 344 |
350 float page_scale_delta, sent_page_scale_delta; | 345 float page_scale_delta, sent_page_scale_delta; |
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1031 | 1026 |
1032 in_paint_layer_contents_ = false; | 1027 in_paint_layer_contents_ = false; |
1033 | 1028 |
1034 occlusion_tracker.overdraw_metrics()->RecordMetrics(this); | 1029 occlusion_tracker.overdraw_metrics()->RecordMetrics(this); |
1035 } | 1030 } |
1036 | 1031 |
1037 void LayerTreeHost::ApplyScrollAndScale(const ScrollAndScaleSet& info) { | 1032 void LayerTreeHost::ApplyScrollAndScale(const ScrollAndScaleSet& info) { |
1038 if (!root_layer_.get()) | 1033 if (!root_layer_.get()) |
1039 return; | 1034 return; |
1040 | 1035 |
1041 gfx::Vector2d root_scroll_delta; | 1036 gfx::Vector2d inner_viewport_scroll_delta; |
1042 Layer* root_scroll_layer = FindFirstScrollableLayer(root_layer_.get()); | 1037 gfx::Vector2d outer_viewport_scroll_delta; |
1043 | 1038 |
1044 for (size_t i = 0; i < info.scrolls.size(); ++i) { | 1039 for (size_t i = 0; i < info.scrolls.size(); ++i) { |
1045 Layer* layer = | 1040 Layer* layer = |
1046 LayerTreeHostCommon::FindLayerInSubtree(root_layer_.get(), | 1041 LayerTreeHostCommon::FindLayerInSubtree(root_layer_.get(), |
1047 info.scrolls[i].layer_id); | 1042 info.scrolls[i].layer_id); |
1048 if (!layer) | 1043 if (!layer) |
1049 continue; | 1044 continue; |
1050 if (layer == root_scroll_layer) { | 1045 if (layer == outer_viewport_scroll_layer_.get()) { |
1051 root_scroll_delta += info.scrolls[i].scroll_delta; | 1046 outer_viewport_scroll_delta += info.scrolls[i].scroll_delta; |
1047 } else if (layer == inner_viewport_scroll_layer_.get()) { | |
1048 inner_viewport_scroll_delta += info.scrolls[i].scroll_delta; | |
1052 } else { | 1049 } else { |
1053 layer->SetScrollOffsetFromImplSide(layer->scroll_offset() + | 1050 layer->SetScrollOffsetFromImplSide(layer->scroll_offset() + |
1054 info.scrolls[i].scroll_delta); | 1051 info.scrolls[i].scroll_delta); |
1055 } | 1052 } |
1056 } | 1053 } |
1057 | 1054 |
1058 if (!root_scroll_delta.IsZero() || info.page_scale_delta != 1.f) { | 1055 if (!inner_viewport_scroll_delta.IsZero() || |
1056 !outer_viewport_scroll_delta.IsZero() || | |
1057 info.page_scale_delta != 1.f) { | |
1059 // SetScrollOffsetFromImplSide above could have destroyed the tree, | 1058 // SetScrollOffsetFromImplSide above could have destroyed the tree, |
1060 // so re-get this layer before doing anything to it. | 1059 // so re-get this layer before doing anything to it. |
1061 root_scroll_layer = FindFirstScrollableLayer(root_layer_.get()); | |
1062 | 1060 |
1063 // Preemptively apply the scroll offset and scale delta here before sending | 1061 // Preemptively apply the scroll offset and scale delta here before sending |
1064 // it to the client. If the client comes back and sets it to the same | 1062 // it to the client. If the client comes back and sets it to the same |
1065 // value, then the layer can early out without needing a full commit. | 1063 // value, then the layer can early out without needing a full commit. |
1066 if (root_scroll_layer) { | 1064 DCHECK(inner_viewport_scroll_layer_); // We should always have this. |
1067 root_scroll_layer->SetScrollOffsetFromImplSide( | 1065 |
1068 root_scroll_layer->scroll_offset() + root_scroll_delta); | 1066 inner_viewport_scroll_layer_->SetScrollOffsetFromImplSide( |
1067 inner_viewport_scroll_layer_->scroll_offset() + | |
1068 inner_viewport_scroll_delta); | |
1069 if (outer_viewport_scroll_layer_) { | |
1070 outer_viewport_scroll_layer_->SetScrollOffsetFromImplSide( | |
1071 outer_viewport_scroll_layer_->scroll_offset() + | |
1072 outer_viewport_scroll_delta); | |
1069 } | 1073 } |
1070 ApplyPageScaleDeltaFromImplSide(info.page_scale_delta); | 1074 ApplyPageScaleDeltaFromImplSide(info.page_scale_delta); |
1071 client_->ApplyScrollAndScale(root_scroll_delta, info.page_scale_delta); | 1075 |
1076 client_->ApplyScrollAndScale( | |
1077 inner_viewport_scroll_delta + outer_viewport_scroll_delta, | |
1078 info.page_scale_delta); | |
1072 } | 1079 } |
1073 } | 1080 } |
1074 | 1081 |
1082 gfx::Vector2d LayerTreeHost::DistributeScrollOffsetToViewports( | |
1083 const gfx::Vector2d offset, | |
1084 Layer* layer) { | |
1085 DCHECK(layer); | |
1086 if (layer != outer_viewport_scroll_layer_.get()) | |
1087 return offset; | |
1088 | |
1089 gfx::Vector2d inner_viewport_offset = | |
1090 inner_viewport_scroll_layer_->scroll_offset(); | |
1091 gfx::Vector2d outer_viewport_offset = | |
1092 outer_viewport_scroll_layer_->scroll_offset(); | |
1093 | |
1094 if (offset == inner_viewport_offset + outer_viewport_offset) { | |
1095 // In this case, nothing should change, so we just return to the outer | |
1096 // viewport the offset is already has. | |
1097 return outer_viewport_offset; | |
1098 } | |
1099 | |
1100 // In the spirit of document-scrolls-first, we always want any change to | |
1101 // go to the outer viewport first. | |
1102 gfx::Vector2d max_outer_viewport_scroll_offset = | |
1103 outer_viewport_scroll_layer_->MaxScrollOffset(); | |
1104 #ifndef NDEBUG | |
enne (OOO)
2014/01/02 19:28:17
#if ENABLE_DCHECK
wjmaclean
2014/01/03 21:57:12
Done.
| |
1105 // The DCHECK below is triggering during zoom-out. | |
1106 /* | |
1107 gfx::Vector2d maxInnerViewportScrollOffset = | |
1108 inner_viewport_scroll_layer_->MaxScrollOffset(); | |
1109 | |
1110 gfx::Vector2d totalMaxScrollOffset = | |
1111 max_outer_viewport_scroll_offset + maxInnerViewportScrollOffset; | |
1112 DCHECK(totalMaxScrollOffset.x() >= offset.x() && | |
1113 totalMaxScrollOffset.y() >= offset.y()); | |
1114 */ | |
1115 #endif | |
1116 | |
1117 outer_viewport_offset = offset - inner_viewport_offset; | |
1118 outer_viewport_offset.SetToMin(max_outer_viewport_scroll_offset); | |
1119 outer_viewport_offset.SetToMax(gfx::Vector2d()); | |
1120 | |
1121 inner_viewport_offset = offset - outer_viewport_offset; | |
1122 inner_viewport_scroll_layer_->SetScrollOffset(inner_viewport_offset); | |
1123 | |
1124 return outer_viewport_offset; | |
1125 } | |
1126 | |
1127 gfx::Vector2d LayerTreeHost::BlinkScrollOffset(const Layer* layer) const { | |
1128 DCHECK(layer); | |
1129 if (layer != inner_viewport_scroll_layer() && | |
1130 layer != outer_viewport_scroll_layer()) | |
1131 return layer->scroll_offset(); | |
1132 | |
1133 DCHECK(inner_viewport_scroll_layer()); | |
1134 gfx::Vector2d offset = | |
1135 inner_viewport_scroll_layer()->scroll_offset(); | |
1136 if (outer_viewport_scroll_layer()) | |
1137 offset += outer_viewport_scroll_layer()->scroll_offset(); | |
1138 return offset; | |
1139 } | |
1140 | |
1141 | |
1075 void LayerTreeHost::StartRateLimiter() { | 1142 void LayerTreeHost::StartRateLimiter() { |
1076 if (animating_) | 1143 if (animating_) |
1077 return; | 1144 return; |
1078 | 1145 |
1079 if (!rate_limit_timer_.IsRunning()) { | 1146 if (!rate_limit_timer_.IsRunning()) { |
1080 rate_limit_timer_.Start(FROM_HERE, | 1147 rate_limit_timer_.Start(FROM_HERE, |
1081 base::TimeDelta(), | 1148 base::TimeDelta(), |
1082 this, | 1149 this, |
1083 &LayerTreeHost::RateLimit); | 1150 &LayerTreeHost::RateLimit); |
1084 } | 1151 } |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1265 swap_promise_list_.push_back(swap_promise.Pass()); | 1332 swap_promise_list_.push_back(swap_promise.Pass()); |
1266 } | 1333 } |
1267 | 1334 |
1268 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) { | 1335 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) { |
1269 for (size_t i = 0; i < swap_promise_list_.size(); i++) | 1336 for (size_t i = 0; i < swap_promise_list_.size(); i++) |
1270 swap_promise_list_[i]->DidNotSwap(reason); | 1337 swap_promise_list_[i]->DidNotSwap(reason); |
1271 swap_promise_list_.clear(); | 1338 swap_promise_list_.clear(); |
1272 } | 1339 } |
1273 | 1340 |
1274 } // namespace cc | 1341 } // namespace cc |
OLD | NEW |