| 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 2505 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2516             .Contains(gfx::ToRoundedPoint(hit_test_point_in_layer_space))) { | 2516             .Contains(gfx::ToRoundedPoint(hit_test_point_in_layer_space))) { | 
| 2517       TRACE_EVENT0("cc", | 2517       TRACE_EVENT0("cc", | 
| 2518                    "LayerImpl::tryScroll: Failed NonFastScrollableRegion"); | 2518                    "LayerImpl::tryScroll: Failed NonFastScrollableRegion"); | 
| 2519       scroll_status.thread = InputHandler::SCROLL_ON_MAIN_THREAD; | 2519       scroll_status.thread = InputHandler::SCROLL_ON_MAIN_THREAD; | 
| 2520       scroll_status.main_thread_scrolling_reasons = | 2520       scroll_status.main_thread_scrolling_reasons = | 
| 2521           MainThreadScrollingReason::kNonFastScrollableRegion; | 2521           MainThreadScrollingReason::kNonFastScrollableRegion; | 
| 2522       return scroll_status; | 2522       return scroll_status; | 
| 2523     } | 2523     } | 
| 2524   } | 2524   } | 
| 2525 | 2525 | 
| 2526   if (IsWheelBasedScroll(type) && |  | 
| 2527       !active_tree()->settings().use_mouse_wheel_gestures) { |  | 
| 2528     EventListenerProperties event_properties = |  | 
| 2529         active_tree()->event_listener_properties( |  | 
| 2530             EventListenerClass::kMouseWheel); |  | 
| 2531     if (event_properties != EventListenerProperties::kNone) { |  | 
| 2532       TRACE_EVENT0("cc", "LayerImpl::tryScroll: Failed WheelEventHandlers"); |  | 
| 2533       scroll_status.thread = InputHandler::SCROLL_ON_MAIN_THREAD; |  | 
| 2534       scroll_status.main_thread_scrolling_reasons = |  | 
| 2535           MainThreadScrollingReason::kEventHandlers; |  | 
| 2536       return scroll_status; |  | 
| 2537     } |  | 
| 2538   } |  | 
| 2539 |  | 
| 2540   if (!scroll_node->data.scrollable) { | 2526   if (!scroll_node->data.scrollable) { | 
| 2541     TRACE_EVENT0("cc", "LayerImpl::tryScroll: Ignored not scrollable"); | 2527     TRACE_EVENT0("cc", "LayerImpl::tryScroll: Ignored not scrollable"); | 
| 2542     scroll_status.thread = InputHandler::SCROLL_IGNORED; | 2528     scroll_status.thread = InputHandler::SCROLL_IGNORED; | 
| 2543     scroll_status.main_thread_scrolling_reasons = | 2529     scroll_status.main_thread_scrolling_reasons = | 
| 2544         MainThreadScrollingReason::kNotScrollable; | 2530         MainThreadScrollingReason::kNotScrollable; | 
| 2545     return scroll_status; | 2531     return scroll_status; | 
| 2546   } | 2532   } | 
| 2547 | 2533 | 
| 2548   gfx::ScrollOffset max_scroll_offset = | 2534   gfx::ScrollOffset max_scroll_offset = | 
| 2549       scroll_tree.MaxScrollOffset(scroll_node->id); | 2535       scroll_tree.MaxScrollOffset(scroll_node->id); | 
| (...skipping 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4043     const { | 4029     const { | 
| 4044   return fixed_raster_scale_attempted_scale_change_history_.count() >= | 4030   return fixed_raster_scale_attempted_scale_change_history_.count() >= | 
| 4045          kFixedRasterScaleAttemptedScaleChangeThreshold; | 4031          kFixedRasterScaleAttemptedScaleChangeThreshold; | 
| 4046 } | 4032 } | 
| 4047 | 4033 | 
| 4048 void LayerTreeHostImpl::SetFixedRasterScaleAttemptedToChangeScale() { | 4034 void LayerTreeHostImpl::SetFixedRasterScaleAttemptedToChangeScale() { | 
| 4049   fixed_raster_scale_attempted_scale_change_history_.set(0); | 4035   fixed_raster_scale_attempted_scale_change_history_.set(0); | 
| 4050 } | 4036 } | 
| 4051 | 4037 | 
| 4052 }  // namespace cc | 4038 }  // namespace cc | 
| OLD | NEW | 
|---|