| 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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 | 354 |
| 355 WebInputEventResult ScrollManager::passScrollGestureEventToWidget( | 355 WebInputEventResult ScrollManager::passScrollGestureEventToWidget( |
| 356 const WebGestureEvent& gestureEvent, | 356 const WebGestureEvent& gestureEvent, |
| 357 LayoutObject* layoutObject) { | 357 LayoutObject* layoutObject) { |
| 358 DCHECK(gestureEvent.isScrollEvent()); | 358 DCHECK(gestureEvent.isScrollEvent()); |
| 359 | 359 |
| 360 if (!m_lastGestureScrollOverWidget || !layoutObject || | 360 if (!m_lastGestureScrollOverWidget || !layoutObject || |
| 361 !layoutObject->isLayoutPart()) | 361 !layoutObject->isLayoutPart()) |
| 362 return WebInputEventResult::NotHandled; | 362 return WebInputEventResult::NotHandled; |
| 363 | 363 |
| 364 FrameViewBase* frameViewBase = toLayoutPart(layoutObject)->widget(); | 364 FrameViewBase* frameViewBase = toLayoutPart(layoutObject)->frameViewBase(); |
| 365 | 365 |
| 366 if (!frameViewBase || !frameViewBase->isFrameView()) | 366 if (!frameViewBase || !frameViewBase->isFrameView()) |
| 367 return WebInputEventResult::NotHandled; | 367 return WebInputEventResult::NotHandled; |
| 368 | 368 |
| 369 return toFrameView(frameViewBase) | 369 return toFrameView(frameViewBase) |
| 370 ->frame() | 370 ->frame() |
| 371 .eventHandler() | 371 .eventHandler() |
| 372 .handleGestureScrollEvent(gestureEvent); | 372 .handleGestureScrollEvent(gestureEvent); |
| 373 } | 373 } |
| 374 | 374 |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 558 if (scrollbar->gestureEvent(targetedEvent.event(), &shouldUpdateCapture)) { | 558 if (scrollbar->gestureEvent(targetedEvent.event(), &shouldUpdateCapture)) { |
| 559 if (shouldUpdateCapture) | 559 if (shouldUpdateCapture) |
| 560 m_scrollbarHandlingScrollGesture = scrollbar; | 560 m_scrollbarHandlingScrollGesture = scrollbar; |
| 561 return true; | 561 return true; |
| 562 } | 562 } |
| 563 } | 563 } |
| 564 return false; | 564 return false; |
| 565 } | 565 } |
| 566 | 566 |
| 567 } // namespace blink | 567 } // namespace blink |
| OLD | NEW |