Changeset 100612 in webkit


Ignore:
Timestamp:
Nov 17, 2011 6:15:36 AM (12 years ago)
Author:
zeno.albisser@nokia.com
Message:

[Qt][WK2] Touch/Mouse events are delivered with wrong coordinates.
https://bugs.webkit.org/show_bug.cgi?id=72604

When using the QtViewportInterationEngine for zooming/panning,
no additional scroll offset should be applied to input events
by the ScrollView.

This patch is based on work by Andreas Kling.

Reviewed by Kenneth Rohde Christiansen.

  • platform/ScrollView.cpp:

(WebCore::ScrollView::windowToContents):
(WebCore::ScrollView::contentsToWindow):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r100609 r100612  
     12011-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
    1182011-11-17  Ben Murdoch  <benm@google.com>
    219
  • trunk/Source/WebCore/platform/ScrollView.cpp

    r100309 r100612  
    713713IntPoint ScrollView::windowToContents(const IntPoint& windowPoint) const
    714714{
     715    if (delegatesScrolling())
     716        return convertFromContainingWindow(windowPoint);
     717
    715718    IntPoint viewPoint = convertFromContainingWindow(windowPoint);
    716719    return viewPoint + scrollOffset();
     
    719722IntPoint ScrollView::contentsToWindow(const IntPoint& contentsPoint) const
    720723{
     724    if (delegatesScrolling())
     725        return convertToContainingWindow(contentsPoint);
     726
    721727    IntPoint viewPoint = contentsPoint - scrollOffset();
    722728    return convertToContainingWindow(viewPoint); 
     
    725731IntRect ScrollView::windowToContents(const IntRect& windowRect) const
    726732{
     733    if (delegatesScrolling())
     734        return convertFromContainingWindow(windowRect);
     735
    727736    IntRect viewRect = convertFromContainingWindow(windowRect);
    728737    viewRect.move(scrollOffset());
     
    732741IntRect ScrollView::contentsToWindow(const IntRect& contentsRect) const
    733742{
     743    if (delegatesScrolling())
     744        return convertToContainingWindow(contentsRect);
     745
    734746    IntRect viewRect = contentsRect;
    735747    viewRect.move(-scrollOffset());
Note: See TracChangeset for help on using the changeset viewer.