| 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_impl.h" | 5 #include "cc/trees/layer_tree_impl.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 1514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1525 start->type == SELECTION_BOUND_EMPTY) { | 1525 start->type == SELECTION_BOUND_EMPTY) { |
| 1526 *end = *start; | 1526 *end = *start; |
| 1527 } else { | 1527 } else { |
| 1528 *end = ComputeViewportSelection( | 1528 *end = ComputeViewportSelection( |
| 1529 selection_end_, | 1529 selection_end_, |
| 1530 selection_end_.layer_id ? LayerById(selection_end_.layer_id) : NULL, | 1530 selection_end_.layer_id ? LayerById(selection_end_.layer_id) : NULL, |
| 1531 device_scale_factor()); | 1531 device_scale_factor()); |
| 1532 } | 1532 } |
| 1533 } | 1533 } |
| 1534 | 1534 |
| 1535 void LayerTreeImpl::RegisterPictureLayerImpl(PictureLayerImpl* layer) { | |
| 1536 layer_tree_host_impl_->RegisterPictureLayerImpl(layer); | |
| 1537 } | |
| 1538 | |
| 1539 void LayerTreeImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { | |
| 1540 layer_tree_host_impl_->UnregisterPictureLayerImpl(layer); | |
| 1541 } | |
| 1542 | |
| 1543 void LayerTreeImpl::InputScrollAnimationFinished() { | 1535 void LayerTreeImpl::InputScrollAnimationFinished() { |
| 1544 layer_tree_host_impl_->ScrollEnd(); | 1536 layer_tree_host_impl_->ScrollEnd(); |
| 1545 } | 1537 } |
| 1546 | 1538 |
| 1547 bool LayerTreeImpl::SmoothnessTakesPriority() const { | 1539 bool LayerTreeImpl::SmoothnessTakesPriority() const { |
| 1548 return layer_tree_host_impl_->GetTreePriority() == SMOOTHNESS_TAKES_PRIORITY; | 1540 return layer_tree_host_impl_->GetTreePriority() == SMOOTHNESS_TAKES_PRIORITY; |
| 1549 } | 1541 } |
| 1550 | 1542 |
| 1551 BlockingTaskRunner* LayerTreeImpl::BlockingMainThreadTaskRunner() const { | 1543 BlockingTaskRunner* LayerTreeImpl::BlockingMainThreadTaskRunner() const { |
| 1552 return proxy()->blocking_main_thread_task_runner(); | 1544 return proxy()->blocking_main_thread_task_runner(); |
| 1553 } | 1545 } |
| 1554 | 1546 |
| 1555 void LayerTreeImpl::SetPendingPageScaleAnimation( | 1547 void LayerTreeImpl::SetPendingPageScaleAnimation( |
| 1556 scoped_ptr<PendingPageScaleAnimation> pending_animation) { | 1548 scoped_ptr<PendingPageScaleAnimation> pending_animation) { |
| 1557 pending_page_scale_animation_ = pending_animation.Pass(); | 1549 pending_page_scale_animation_ = pending_animation.Pass(); |
| 1558 } | 1550 } |
| 1559 | 1551 |
| 1560 scoped_ptr<PendingPageScaleAnimation> | 1552 scoped_ptr<PendingPageScaleAnimation> |
| 1561 LayerTreeImpl::TakePendingPageScaleAnimation() { | 1553 LayerTreeImpl::TakePendingPageScaleAnimation() { |
| 1562 return pending_page_scale_animation_.Pass(); | 1554 return pending_page_scale_animation_.Pass(); |
| 1563 } | 1555 } |
| 1564 | 1556 |
| 1565 } // namespace cc | 1557 } // namespace cc |
| OLD | NEW |