| 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 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 454 } | 454 } |
| 455 | 455 |
| 456 switch (gestureEvent.type()) { | 456 switch (gestureEvent.type()) { |
| 457 case WebInputEvent::GestureScrollBegin: | 457 case WebInputEvent::GestureScrollBegin: |
| 458 return handleGestureScrollBegin(gestureEvent); | 458 return handleGestureScrollBegin(gestureEvent); |
| 459 case WebInputEvent::GestureScrollUpdate: | 459 case WebInputEvent::GestureScrollUpdate: |
| 460 return handleGestureScrollUpdate(gestureEvent); | 460 return handleGestureScrollUpdate(gestureEvent); |
| 461 case WebInputEvent::GestureScrollEnd: | 461 case WebInputEvent::GestureScrollEnd: |
| 462 return handleGestureScrollEnd(gestureEvent); | 462 return handleGestureScrollEnd(gestureEvent); |
| 463 case WebInputEvent::GestureFlingStart: | 463 case WebInputEvent::GestureFlingStart: |
| 464 case WebInputEvent::GestureFlingCancel: |
| 464 case WebInputEvent::GesturePinchBegin: | 465 case WebInputEvent::GesturePinchBegin: |
| 465 case WebInputEvent::GesturePinchEnd: | 466 case WebInputEvent::GesturePinchEnd: |
| 466 case WebInputEvent::GesturePinchUpdate: | 467 case WebInputEvent::GesturePinchUpdate: |
| 467 return WebInputEventResult::NotHandled; | 468 return WebInputEventResult::NotHandled; |
| 468 default: | 469 default: |
| 469 NOTREACHED(); | 470 NOTREACHED(); |
| 470 return WebInputEventResult::NotHandled; | 471 return WebInputEventResult::NotHandled; |
| 471 } | 472 } |
| 472 } | 473 } |
| 473 | 474 |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 if (scrollbar->gestureEvent(targetedEvent.event(), &shouldUpdateCapture)) { | 554 if (scrollbar->gestureEvent(targetedEvent.event(), &shouldUpdateCapture)) { |
| 554 if (shouldUpdateCapture) | 555 if (shouldUpdateCapture) |
| 555 m_scrollbarHandlingScrollGesture = scrollbar; | 556 m_scrollbarHandlingScrollGesture = scrollbar; |
| 556 return true; | 557 return true; |
| 557 } | 558 } |
| 558 } | 559 } |
| 559 return false; | 560 return false; |
| 560 } | 561 } |
| 561 | 562 |
| 562 } // namespace blink | 563 } // namespace blink |
| OLD | NEW |