OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "core/input/ScrollManager.h" | 5 #include "core/input/ScrollManager.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include "core/dom/DOMNodeIds.h" | 8 #include "core/dom/DOMNodeIds.h" |
9 #include "core/events/GestureEvent.h" | 9 #include "core/events/GestureEvent.h" |
10 #include "core/frame/BrowserControls.h" | 10 #include "core/frame/BrowserControls.h" |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 scrollStateData->position_x = position.x(); | 228 scrollStateData->position_x = position.x(); |
229 scrollStateData->position_y = position.y(); | 229 scrollStateData->position_y = position.y(); |
230 scrollStateData->is_beginning = true; | 230 scrollStateData->is_beginning = true; |
231 scrollStateData->from_user_input = true; | 231 scrollStateData->from_user_input = true; |
232 scrollStateData->is_direct_manipulation = | 232 scrollStateData->is_direct_manipulation = |
233 gestureEvent.sourceDevice == WebGestureDeviceTouchscreen; | 233 gestureEvent.sourceDevice == WebGestureDeviceTouchscreen; |
234 scrollStateData->delta_consumed_for_scroll_sequence = | 234 scrollStateData->delta_consumed_for_scroll_sequence = |
235 m_deltaConsumedForScrollSequence; | 235 m_deltaConsumedForScrollSequence; |
236 ScrollState* scrollState = ScrollState::create(std::move(scrollStateData)); | 236 ScrollState* scrollState = ScrollState::create(std::move(scrollStateData)); |
237 customizedScroll(*m_scrollGestureHandlingNode.get(), *scrollState); | 237 customizedScroll(*m_scrollGestureHandlingNode.get(), *scrollState); |
| 238 |
| 239 if (gestureEvent.sourceDevice == WebGestureDeviceTouchscreen) |
| 240 UseCounter::count(m_frame->document(), UseCounter::ScrollByTouch); |
| 241 else |
| 242 UseCounter::count(m_frame->document(), UseCounter::ScrollByWheel); |
| 243 |
238 return WebInputEventResult::HandledSystem; | 244 return WebInputEventResult::HandledSystem; |
239 } | 245 } |
240 | 246 |
241 WebInputEventResult ScrollManager::handleGestureScrollUpdate( | 247 WebInputEventResult ScrollManager::handleGestureScrollUpdate( |
242 const WebGestureEvent& gestureEvent) { | 248 const WebGestureEvent& gestureEvent) { |
243 DCHECK_EQ(gestureEvent.type(), WebInputEvent::GestureScrollUpdate); | 249 DCHECK_EQ(gestureEvent.type(), WebInputEvent::GestureScrollUpdate); |
244 | 250 |
245 Node* node = m_scrollGestureHandlingNode.get(); | 251 Node* node = m_scrollGestureHandlingNode.get(); |
246 if (!node || !node->layoutObject()) | 252 if (!node || !node->layoutObject()) |
247 return WebInputEventResult::NotHandled; | 253 return WebInputEventResult::NotHandled; |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
553 if (scrollbar->gestureEvent(targetedEvent.event(), &shouldUpdateCapture)) { | 559 if (scrollbar->gestureEvent(targetedEvent.event(), &shouldUpdateCapture)) { |
554 if (shouldUpdateCapture) | 560 if (shouldUpdateCapture) |
555 m_scrollbarHandlingScrollGesture = scrollbar; | 561 m_scrollbarHandlingScrollGesture = scrollbar; |
556 return true; | 562 return true; |
557 } | 563 } |
558 } | 564 } |
559 return false; | 565 return false; |
560 } | 566 } |
561 | 567 |
562 } // namespace blink | 568 } // namespace blink |
OLD | NEW |