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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
229 scrollStateData->position_x = position.x(); | 229 scrollStateData->position_x = position.x(); |
230 scrollStateData->position_y = position.y(); | 230 scrollStateData->position_y = position.y(); |
231 scrollStateData->is_beginning = true; | 231 scrollStateData->is_beginning = true; |
232 scrollStateData->from_user_input = true; | 232 scrollStateData->from_user_input = true; |
233 scrollStateData->is_direct_manipulation = | 233 scrollStateData->is_direct_manipulation = |
234 gestureEvent.sourceDevice == WebGestureDeviceTouchscreen; | 234 gestureEvent.sourceDevice == WebGestureDeviceTouchscreen; |
235 scrollStateData->delta_consumed_for_scroll_sequence = | 235 scrollStateData->delta_consumed_for_scroll_sequence = |
236 m_deltaConsumedForScrollSequence; | 236 m_deltaConsumedForScrollSequence; |
237 ScrollState* scrollState = ScrollState::create(std::move(scrollStateData)); | 237 ScrollState* scrollState = ScrollState::create(std::move(scrollStateData)); |
238 customizedScroll(*m_scrollGestureHandlingNode.get(), *scrollState); | 238 customizedScroll(*m_scrollGestureHandlingNode.get(), *scrollState); |
239 | |
240 if (gestureEvent.sourceDevice == WebGestureDeviceTouchscreen) | |
bokan
2017/03/09 17:31:03
Put this in a method on Page and share it between
bokan
2017/03/09 18:31:15
Actually, I guess this wouldn't really help much.
sahel
2017/03/10 16:21:33
Acknowledged.
| |
241 UseCounter::count(m_frame->document(), UseCounter::ScrollByTouch); | |
242 else | |
243 UseCounter::count(m_frame->document(), UseCounter::ScrollByWheel); | |
244 | |
239 return WebInputEventResult::HandledSystem; | 245 return WebInputEventResult::HandledSystem; |
240 } | 246 } |
241 | 247 |
242 WebInputEventResult ScrollManager::handleGestureScrollUpdate( | 248 WebInputEventResult ScrollManager::handleGestureScrollUpdate( |
243 const WebGestureEvent& gestureEvent) { | 249 const WebGestureEvent& gestureEvent) { |
244 DCHECK_EQ(gestureEvent.type(), WebInputEvent::GestureScrollUpdate); | 250 DCHECK_EQ(gestureEvent.type(), WebInputEvent::GestureScrollUpdate); |
245 | 251 |
246 Node* node = m_scrollGestureHandlingNode.get(); | 252 Node* node = m_scrollGestureHandlingNode.get(); |
247 if (!node || !node->layoutObject()) | 253 if (!node || !node->layoutObject()) |
248 return WebInputEventResult::NotHandled; | 254 return WebInputEventResult::NotHandled; |
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
558 if (scrollbar->gestureEvent(targetedEvent.event(), &shouldUpdateCapture)) { | 564 if (scrollbar->gestureEvent(targetedEvent.event(), &shouldUpdateCapture)) { |
559 if (shouldUpdateCapture) | 565 if (shouldUpdateCapture) |
560 m_scrollbarHandlingScrollGesture = scrollbar; | 566 m_scrollbarHandlingScrollGesture = scrollbar; |
561 return true; | 567 return true; |
562 } | 568 } |
563 } | 569 } |
564 return false; | 570 return false; |
565 } | 571 } |
566 | 572 |
567 } // namespace blink | 573 } // namespace blink |
OLD | NEW |