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

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

Issue 2340533003: Fix issue with non-touchpad scrolling event over resizer: should not cause an area resize. (Closed)
Patch Set: Codereview update Created 4 years, 3 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
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/scroll-behavior/scroll-over-resizer.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "core/dom/DOMNodeIds.h" 7 #include "core/dom/DOMNodeIds.h"
8 #include "core/events/GestureEvent.h" 8 #include "core/events/GestureEvent.h"
9 #include "core/frame/FrameHost.h" 9 #include "core/frame/FrameHost.h"
10 #include "core/frame/FrameView.h" 10 #include "core/frame/FrameView.h"
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 } 426 }
427 } 427 }
428 428
429 bool ScrollManager::isScrollbarHandlingGestures() const 429 bool ScrollManager::isScrollbarHandlingGestures() const
430 { 430 {
431 return m_scrollbarHandlingScrollGesture.get(); 431 return m_scrollbarHandlingScrollGesture.get();
432 } 432 }
433 433
434 bool ScrollManager::handleScrollGestureOnResizer(Node* eventTarget, const Platfo rmGestureEvent& gestureEvent) 434 bool ScrollManager::handleScrollGestureOnResizer(Node* eventTarget, const Platfo rmGestureEvent& gestureEvent)
435 { 435 {
436 if (gestureEvent.source() != PlatformGestureSourceTouchscreen)
437 return false;
438
436 if (gestureEvent.type() == PlatformEvent::GestureScrollBegin) { 439 if (gestureEvent.type() == PlatformEvent::GestureScrollBegin) {
437 PaintLayer* layer = eventTarget->layoutObject() ? eventTarget->layoutObj ect()->enclosingLayer() : nullptr; 440 PaintLayer* layer = eventTarget->layoutObject() ? eventTarget->layoutObj ect()->enclosingLayer() : nullptr;
438 IntPoint p = m_frame->view()->rootFrameToContents(gestureEvent.position( )); 441 IntPoint p = m_frame->view()->rootFrameToContents(gestureEvent.position( ));
439 if (layer && layer->getScrollableArea() && layer->getScrollableArea()->i sPointInResizeControl(p, ResizerForTouch)) { 442 if (layer && layer->getScrollableArea() && layer->getScrollableArea()->i sPointInResizeControl(p, ResizerForTouch)) {
440 m_resizeScrollableArea = layer->getScrollableArea(); 443 m_resizeScrollableArea = layer->getScrollableArea();
441 m_resizeScrollableArea->setInResizeMode(true); 444 m_resizeScrollableArea->setInResizeMode(true);
442 m_offsetFromResizeCorner = LayoutSize(m_resizeScrollableArea->offset FromResizeCorner(p)); 445 m_offsetFromResizeCorner = LayoutSize(m_resizeScrollableArea->offset FromResizeCorner(p));
443 return true; 446 return true;
444 } 447 }
445 } else if (gestureEvent.type() == PlatformEvent::GestureScrollUpdate) { 448 } else if (gestureEvent.type() == PlatformEvent::GestureScrollUpdate) {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 DEFINE_TRACE(ScrollManager) 506 DEFINE_TRACE(ScrollManager)
504 { 507 {
505 visitor->trace(m_frame); 508 visitor->trace(m_frame);
506 visitor->trace(m_scrollGestureHandlingNode); 509 visitor->trace(m_scrollGestureHandlingNode);
507 visitor->trace(m_previousGestureScrolledNode); 510 visitor->trace(m_previousGestureScrolledNode);
508 visitor->trace(m_scrollbarHandlingScrollGesture); 511 visitor->trace(m_scrollbarHandlingScrollGesture);
509 visitor->trace(m_resizeScrollableArea); 512 visitor->trace(m_resizeScrollableArea);
510 } 513 }
511 514
512 } // namespace blink 515 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/scroll-behavior/scroll-over-resizer.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698