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 #include <limits> | 8 #include <limits> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 1361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1372 metadata.min_page_scale_factor = active_tree_->min_page_scale_factor(); | 1372 metadata.min_page_scale_factor = active_tree_->min_page_scale_factor(); |
1373 metadata.max_page_scale_factor = active_tree_->max_page_scale_factor(); | 1373 metadata.max_page_scale_factor = active_tree_->max_page_scale_factor(); |
1374 if (top_controls_manager_) { | 1374 if (top_controls_manager_) { |
1375 metadata.location_bar_offset = | 1375 metadata.location_bar_offset = |
1376 gfx::Vector2dF(0.f, top_controls_manager_->controls_top_offset()); | 1376 gfx::Vector2dF(0.f, top_controls_manager_->controls_top_offset()); |
1377 metadata.location_bar_content_translation = | 1377 metadata.location_bar_content_translation = |
1378 gfx::Vector2dF(0.f, top_controls_manager_->content_top_offset()); | 1378 gfx::Vector2dF(0.f, top_controls_manager_->content_top_offset()); |
1379 metadata.overdraw_bottom_height = overdraw_bottom_height_; | 1379 metadata.overdraw_bottom_height = overdraw_bottom_height_; |
1380 } | 1380 } |
1381 | 1381 |
| 1382 active_tree_->GetViewportSelection(&metadata.selection_anchor, |
| 1383 &metadata.selection_focus); |
| 1384 |
1382 if (!InnerViewportScrollLayer()) | 1385 if (!InnerViewportScrollLayer()) |
1383 return metadata; | 1386 return metadata; |
1384 | 1387 |
1385 metadata.root_scroll_offset = active_tree_->TotalScrollOffset(); | 1388 metadata.root_scroll_offset = active_tree_->TotalScrollOffset(); |
1386 | 1389 |
1387 return metadata; | 1390 return metadata; |
1388 } | 1391 } |
1389 | 1392 |
1390 static void LayerTreeHostImplDidBeginTracingCallback(LayerImpl* layer) { | 1393 static void LayerTreeHostImplDidBeginTracingCallback(LayerImpl* layer) { |
1391 layer->DidBeginTracing(); | 1394 layer->DidBeginTracing(); |
(...skipping 1754 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3146 } | 3149 } |
3147 | 3150 |
3148 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { | 3151 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { |
3149 std::vector<PictureLayerImpl*>::iterator it = | 3152 std::vector<PictureLayerImpl*>::iterator it = |
3150 std::find(picture_layers_.begin(), picture_layers_.end(), layer); | 3153 std::find(picture_layers_.begin(), picture_layers_.end(), layer); |
3151 DCHECK(it != picture_layers_.end()); | 3154 DCHECK(it != picture_layers_.end()); |
3152 picture_layers_.erase(it); | 3155 picture_layers_.erase(it); |
3153 } | 3156 } |
3154 | 3157 |
3155 } // namespace cc | 3158 } // namespace cc |
OLD | NEW |