Changeset 100612 in webkit
- Timestamp:
- Nov 17, 2011 6:15:36 AM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r100609 r100612 1 2011-11-17 Zeno Albisser <zeno@webkit.org> 2 3 [Qt][WK2] Touch/Mouse events are delivered with wrong coordinates. 4 https://bugs.webkit.org/show_bug.cgi?id=72604 5 6 When using the QtViewportInterationEngine for zooming/panning, 7 no additional scroll offset should be applied to input events 8 by the ScrollView. 9 10 This patch is based on work by Andreas Kling. 11 12 Reviewed by Kenneth Rohde Christiansen. 13 14 * platform/ScrollView.cpp: 15 (WebCore::ScrollView::windowToContents): 16 (WebCore::ScrollView::contentsToWindow): 17 1 18 2011-11-17 Ben Murdoch <benm@google.com> 2 19 -
trunk/Source/WebCore/platform/ScrollView.cpp
r100309 r100612 713 713 IntPoint ScrollView::windowToContents(const IntPoint& windowPoint) const 714 714 { 715 if (delegatesScrolling()) 716 return convertFromContainingWindow(windowPoint); 717 715 718 IntPoint viewPoint = convertFromContainingWindow(windowPoint); 716 719 return viewPoint + scrollOffset(); … … 719 722 IntPoint ScrollView::contentsToWindow(const IntPoint& contentsPoint) const 720 723 { 724 if (delegatesScrolling()) 725 return convertToContainingWindow(contentsPoint); 726 721 727 IntPoint viewPoint = contentsPoint - scrollOffset(); 722 728 return convertToContainingWindow(viewPoint); … … 725 731 IntRect ScrollView::windowToContents(const IntRect& windowRect) const 726 732 { 733 if (delegatesScrolling()) 734 return convertFromContainingWindow(windowRect); 735 727 736 IntRect viewRect = convertFromContainingWindow(windowRect); 728 737 viewRect.move(scrollOffset()); … … 732 741 IntRect ScrollView::contentsToWindow(const IntRect& contentsRect) const 733 742 { 743 if (delegatesScrolling()) 744 return convertToContainingWindow(contentsRect); 745 734 746 IntRect viewRect = contentsRect; 735 747 viewRect.move(-scrollOffset());
Note: See TracChangeset
for help on using the changeset viewer.