Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(732)

Side by Side Diff: third_party/WebKit/Source/core/input/ScrollManager.cpp

Issue 2810873007: Replace LayoutPart::GetFrameViewBase with GetNodeFrameView (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 357
358 WebInputEventResult ScrollManager::PassScrollGestureEvent( 358 WebInputEventResult ScrollManager::PassScrollGestureEvent(
359 const WebGestureEvent& gesture_event, 359 const WebGestureEvent& gesture_event,
360 LayoutObject* layout_object) { 360 LayoutObject* layout_object) {
361 DCHECK(gesture_event.IsScrollEvent()); 361 DCHECK(gesture_event.IsScrollEvent());
362 362
363 if (!last_gesture_scroll_over_frame_view_base_ || !layout_object || 363 if (!last_gesture_scroll_over_frame_view_base_ || !layout_object ||
364 !layout_object->IsLayoutPart()) 364 !layout_object->IsLayoutPart())
365 return WebInputEventResult::kNotHandled; 365 return WebInputEventResult::kNotHandled;
366 366
367 FrameViewBase* frame_view_base = 367 FrameView* frame_view = ToLayoutPart(layout_object)->GetNodeFrameView();
368 ToLayoutPart(layout_object)->GetFrameViewBase();
369 368
370 if (!frame_view_base || !frame_view_base->IsFrameView()) 369 if (!frame_view)
371 return WebInputEventResult::kNotHandled; 370 return WebInputEventResult::kNotHandled;
372 371
373 return ToFrameView(frame_view_base) 372 return frame_view->GetFrame().GetEventHandler().HandleGestureScrollEvent(
374 ->GetFrame() 373 gesture_event);
375 .GetEventHandler()
376 .HandleGestureScrollEvent(gesture_event);
377 } 374 }
378 375
379 bool ScrollManager::IsViewportScrollingElement(const Element& element) const { 376 bool ScrollManager::IsViewportScrollingElement(const Element& element) const {
380 // The root scroller is the one Element on the page designated to perform 377 // The root scroller is the one Element on the page designated to perform
381 // "viewport actions" like browser controls movement and overscroll glow. 378 // "viewport actions" like browser controls movement and overscroll glow.
382 if (!frame_->GetDocument()) 379 if (!frame_->GetDocument())
383 return false; 380 return false;
384 381
385 return frame_->GetDocument()->GetRootScrollerController().ScrollsViewport( 382 return frame_->GetDocument()->GetRootScrollerController().ScrollsViewport(
386 element); 383 element);
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 &should_update_capture)) { 563 &should_update_capture)) {
567 if (should_update_capture) 564 if (should_update_capture)
568 scrollbar_handling_scroll_gesture_ = scrollbar; 565 scrollbar_handling_scroll_gesture_ = scrollbar;
569 return true; 566 return true;
570 } 567 }
571 } 568 }
572 return false; 569 return false;
573 } 570 }
574 571
575 } // namespace blink 572 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698