| Index: third_party/WebKit/Source/core/input/ScrollManager.cpp
|
| diff --git a/third_party/WebKit/Source/core/input/ScrollManager.cpp b/third_party/WebKit/Source/core/input/ScrollManager.cpp
|
| index 76a67a5702c3dd154cfc2454c718d515740b14a8..38bc0e55dbde3a32b6ebf745cd3c01aa1c4685a2 100644
|
| --- a/third_party/WebKit/Source/core/input/ScrollManager.cpp
|
| +++ b/third_party/WebKit/Source/core/input/ScrollManager.cpp
|
| @@ -428,16 +428,13 @@ WebInputEventResult ScrollManager::PassScrollGestureEvent(
|
| !layout_object->IsLayoutPart())
|
| return WebInputEventResult::kNotHandled;
|
|
|
| - FrameViewBase* frame_view_base =
|
| - ToLayoutPart(layout_object)->GetFrameViewBase();
|
| + FrameView* frame_view = ToLayoutPart(layout_object)->ChildFrameView();
|
|
|
| - if (!frame_view_base || !frame_view_base->IsFrameView())
|
| + if (!frame_view)
|
| return WebInputEventResult::kNotHandled;
|
|
|
| - return ToFrameView(frame_view_base)
|
| - ->GetFrame()
|
| - .GetEventHandler()
|
| - .HandleGestureScrollEvent(gesture_event);
|
| + return frame_view->GetFrame().GetEventHandler().HandleGestureScrollEvent(
|
| + gesture_event);
|
| }
|
|
|
| bool ScrollManager::IsViewportScrollingElement(const Element& element) const {
|
|
|