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 <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 2755 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2766 ScrollNode* scrolling_node, | 2766 ScrollNode* scrolling_node, |
2767 InputHandler::ScrollInputType type) { | 2767 InputHandler::ScrollInputType type) { |
2768 DCHECK(scroll_state); | 2768 DCHECK(scroll_state); |
2769 DCHECK(scroll_state->delta_x() == 0 && scroll_state->delta_y() == 0); | 2769 DCHECK(scroll_state->delta_x() == 0 && scroll_state->delta_y() == 0); |
2770 | 2770 |
2771 InputHandler::ScrollStatus scroll_status; | 2771 InputHandler::ScrollStatus scroll_status; |
2772 scroll_status.main_thread_scrolling_reasons = | 2772 scroll_status.main_thread_scrolling_reasons = |
2773 MainThreadScrollingReason::kNotScrollingOnMain; | 2773 MainThreadScrollingReason::kNotScrollingOnMain; |
2774 if (!scrolling_node) { | 2774 if (!scrolling_node) { |
2775 scroll_status.thread = SCROLL_IGNORED; | 2775 scroll_status.thread = SCROLL_IGNORED; |
| 2776 if (settings_.is_layer_tree_for_subframe) |
| 2777 scroll_status.thread = SCROLL_UNKNOWN; |
2776 scroll_status.main_thread_scrolling_reasons = | 2778 scroll_status.main_thread_scrolling_reasons = |
2777 MainThreadScrollingReason::kNoScrollingLayer; | 2779 MainThreadScrollingReason::kNoScrollingLayer; |
2778 return scroll_status; | 2780 return scroll_status; |
2779 } | 2781 } |
2780 scroll_status.thread = SCROLL_ON_IMPL_THREAD; | 2782 scroll_status.thread = SCROLL_ON_IMPL_THREAD; |
2781 mutator_host_->ScrollAnimationAbort(); | 2783 mutator_host_->ScrollAnimationAbort(); |
2782 | 2784 |
2783 browser_controls_offset_manager_->ScrollBegin(); | 2785 browser_controls_offset_manager_->ScrollBegin(); |
2784 | 2786 |
2785 active_tree_->SetCurrentlyScrollingNode(scrolling_node); | 2787 active_tree_->SetCurrentlyScrollingNode(scrolling_node); |
(...skipping 1523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4309 | 4311 |
4310 void LayerTreeHostImpl::ShowScrollbarsForImplScroll(ElementId element_id) { | 4312 void LayerTreeHostImpl::ShowScrollbarsForImplScroll(ElementId element_id) { |
4311 if (!element_id) | 4313 if (!element_id) |
4312 return; | 4314 return; |
4313 if (ScrollbarAnimationController* animation_controller = | 4315 if (ScrollbarAnimationController* animation_controller = |
4314 ScrollbarAnimationControllerForElementId(element_id)) | 4316 ScrollbarAnimationControllerForElementId(element_id)) |
4315 animation_controller->DidScrollUpdate(); | 4317 animation_controller->DidScrollUpdate(); |
4316 } | 4318 } |
4317 | 4319 |
4318 } // namespace cc | 4320 } // namespace cc |
OLD | NEW |