Changeset 219571 in webkit

Timestamp:

Jul 17, 2017, 1:24:16 PM (9 years ago)

Author:

Simon Fraser

Message:

clientX/clientY on TouchEvent.touches are wrong
​https://bugs.webkit.org/show_bug.cgi?id=174561
Source/WebCore:

rdar://problem/33336041

Reviewed by Tim Horton.

Do some refactoring so that WebKitAdditions code that computes Touch coordinates can use
the same code that MouseRelatedEvent uses.

There is no behavior change in this patch, but the test exercises a behavior change in
WebKitAdditions code.

Test: fast/events/touch/ios/touches-client-coords-after-zoom.html

• dom/MouseRelatedEvent.cpp:

(WebCore::MouseRelatedEvent::init):
(WebCore::MouseRelatedEvent::frameViewFromDOMWindow):
(WebCore::MouseRelatedEvent::pagePointToClientPoint):
(WebCore::MouseRelatedEvent::pagePointToAbsolutePoint):
(WebCore::MouseRelatedEvent::initCoordinates):
(WebCore::MouseRelatedEvent::documentToAbsoluteScaleFactor):
(WebCore::MouseRelatedEvent::computePageLocation):
(WebCore::MouseRelatedEvent::locationInRootViewCoordinates):
(WebCore::MouseRelatedEvent::frameView): Deleted.

• dom/MouseRelatedEvent.h:

LayoutTests:

Reviewed by Tim Horton.

• fast/events/touch/ios/touches-client-coords-after-zoom-expected.txt: Added.
• fast/events/touch/ios/touches-client-coords-after-zoom.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/touch/ios/touches-client-coords-after-zoom-expected.txt (added)
• LayoutTests/fast/events/touch/ios/touches-client-coords-after-zoom.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/MouseRelatedEvent.cpp (modified) (6 diffs)
• Source/WebCore/dom/MouseRelatedEvent.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-07-17  Simon Fraser  <simon.fraser@apple.com>
+
+        clientX/clientY on TouchEvent.touches are wrong
+        https://bugs.webkit.org/show_bug.cgi?id=174561
+
+        Reviewed by Tim Horton.
+
+        * fast/events/touch/ios/touches-client-coords-after-zoom-expected.txt: Added.
+        * fast/events/touch/ios/touches-client-coords-after-zoom.html: Added.
+
 2017-07-17  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-17  Simon Fraser  <simon.fraser@apple.com>
+
+        clientX/clientY on TouchEvent.touches are wrong
+        https://bugs.webkit.org/show_bug.cgi?id=174561
+        rdar://problem/33336041
+
+        Reviewed by Tim Horton.
+        
+        Do some refactoring so that WebKitAdditions code that computes Touch coordinates can use
+        the same code that MouseRelatedEvent uses.
+        
+        There is no behavior change in this patch, but the test exercises a behavior change in
+        WebKitAdditions code.
+
+        Test: fast/events/touch/ios/touches-client-coords-after-zoom.html
+
+        * dom/MouseRelatedEvent.cpp:
+        (WebCore::MouseRelatedEvent::init):
+        (WebCore::MouseRelatedEvent::frameViewFromDOMWindow):
+        (WebCore::MouseRelatedEvent::pagePointToClientPoint):
+        (WebCore::MouseRelatedEvent::pagePointToAbsolutePoint):
+        (WebCore::MouseRelatedEvent::initCoordinates):
+        (WebCore::MouseRelatedEvent::documentToAbsoluteScaleFactor):
+        (WebCore::MouseRelatedEvent::computePageLocation):
+        (WebCore::MouseRelatedEvent::locationInRootViewCoordinates):
+        (WebCore::MouseRelatedEvent::frameView): Deleted.
+        * dom/MouseRelatedEvent.h:
+
 2017-07-17  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebCore/dom/MouseRelatedEvent.cpp

@@ -62 +62 @@
 {
     if (!isSimulated) {
-        if (auto* frameView = this->frameView()) {
+        if (auto* frameView = frameViewFromDOMWindow(view())) {
             FloatPoint absolutePoint = frameView->windowToContents(windowLocation);
             FloatPoint documentPoint = frameView->absoluteToDocumentPoint(absolutePoint);
             m_pageLocation = flooredLayoutPoint(documentPoint);
-            m_clientLocation = flooredLayoutPoint(frameView->documentToClientPoint(documentPoint));
+            m_clientLocation = pagePointToClientPoint(m_pageLocation, frameView);
         }
     }
@@ -84 +84 @@
 }
 
+FrameView* MouseRelatedEvent::frameViewFromDOMWindow(DOMWindow* window)
+{
+    auto* frame = window ? window->frame() : nullptr;
+    if (!frame)
+        return nullptr;
+
+    return frame->view();
+}
+
+LayoutPoint MouseRelatedEvent::pagePointToClientPoint(LayoutPoint pagePoint, FrameView* frameView)
+{
+    if (!frameView)
+        return pagePoint;
+
+    return flooredLayoutPoint(frameView->documentToClientPoint(pagePoint));
+}
+
+LayoutPoint MouseRelatedEvent::pagePointToAbsolutePoint(LayoutPoint pagePoint, FrameView* frameView)
+{
+    if (!frameView)
+        return pagePoint;
+    
+    return pagePoint.scaled(frameView->documentToAbsoluteScaleFactor());
+}
+
 void MouseRelatedEvent::initCoordinates(const LayoutPoint& clientLocation)
 {
@@ -89 +114 @@
     // Correct values are computed lazily, see computeRelativePosition.
     FloatSize documentToClientOffset;
-    if (auto* frameView = this->frameView())
+    if (auto* frameView = frameViewFromDOMWindow(view()))
         documentToClientOffset = frameView->documentToClientOffset();
 
@@ -102 +127 @@
 }
 
-FrameView* MouseRelatedEvent::frameView() const
-{
-    auto* frame = view() ? view()->frame() : nullptr;
-    if (!frame)
-        return nullptr;
-
-    return frame->view();
-}
-
 float MouseRelatedEvent::documentToAbsoluteScaleFactor() const
 {
-    if (auto* frameView = this->frameView())
+    if (auto* frameView = frameViewFromDOMWindow(view()))
         return frameView->documentToAbsoluteScaleFactor();
 
@@ -121 +137 @@
 void MouseRelatedEvent::computePageLocation()
 {
-    m_absoluteLocation = m_pageLocation.scaled(documentToAbsoluteScaleFactor());
+    m_absoluteLocation = pagePointToAbsolutePoint(m_pageLocation, frameViewFromDOMWindow(view()));
 }
 
@@ -170 +186 @@
 FloatPoint MouseRelatedEvent::locationInRootViewCoordinates() const
 {
-    return frameView()->contentsToRootView(roundedIntPoint(m_absoluteLocation));
+    if (auto* frameView = frameViewFromDOMWindow(view()))
+        return frameView->contentsToRootView(roundedIntPoint(m_absoluteLocation));
+
+    return m_absoluteLocation;
 }
 

trunk/Source/WebCore/dom/MouseRelatedEvent.h

@@ -66 +66 @@
     // usable with RenderObject::absoluteToLocal).
     const LayoutPoint& absoluteLocation() const { return m_absoluteLocation; }
+    
+    static FrameView* frameViewFromDOMWindow(DOMWindow*);
+
+    static LayoutPoint pagePointToClientPoint(LayoutPoint pagePoint, FrameView*);
+    static LayoutPoint pagePointToAbsolutePoint(LayoutPoint pagePoint, FrameView*);
 
 protected:
@@ -85 +90 @@
 
     float documentToAbsoluteScaleFactor() const;
-    FrameView* frameView() const;
 
     // Expose these so MouseEvent::initMouseEvent can set them.