Fix mouse pointer event clientX/Y

third_party/WebKit/Source/core/events/PointerEventFactory.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/events/PointerEventFactory.h"
 
+#include "core/frame/FrameView.h"
 #include "platform/geometry/FloatSize.h"
 
 namespace blink {
 
 namespace {
 
 inline int toInt(WebPointerProperties::PointerType t) { return static_cast<int>(t); }
 
 const char* pointerTypeNameForWebPointPointerType(WebPointerProperties::PointerType type)
 {
@@ skipping 65 matching lines @@
 {
     pointerEventInit.setBubbles(type != EventTypeNames::pointerenter
         && type != EventTypeNames::pointerleave);
     pointerEventInit.setCancelable(type != EventTypeNames::pointerenter
         && type != EventTypeNames::pointerleave && type != EventTypeNames::pointercancel);
 }
 
 PointerEvent* PointerEventFactory::create(
     const AtomicString& mouseEventName, const PlatformMouseEvent& mouseEvent,
     EventTarget* relatedTarget,
-    AbstractView* view)
+    LocalDOMWindow* view)
 {
     AtomicString pointerEventName = pointerEventNameForMouseEventName(mouseEventName);
     unsigned buttons = MouseEvent::platformModifiersToButtons(mouseEvent.getModifiers());
     PointerEventInit pointerEventInit;
 
     setIdTypeButtons(pointerEventInit, mouseEvent.pointerProperties(), buttons);
     setBubblesAndCancelable(pointerEventInit, pointerEventName);
 
     pointerEventInit.setScreenX(mouseEvent.globalPosition().x());
     pointerEventInit.setScreenY(mouseEvent.globalPosition().y());
-    pointerEventInit.setClientX(mouseEvent.position().x());
-    pointerEventInit.setClientY(mouseEvent.position().y());
+
+    LayoutPoint scrollPosition;
+    LayoutPoint adjustedPageLocation;
+    if (view && view->frame()) {
+        LocalFrame* frame = view->frame();
+        if (FrameView* frameView = frame->view()) {

[bokan, 2016/05/10 22:24:09]

Fold this check into the above one.

[Navid Zolghadr, 2016/05/11 18:09:43]

Done.

+            scrollPosition = frameView->scrollPosition();
+            adjustedPageLocation = frameView->rootFrameToContents(mouseEvent.position());

[bokan, 2016/05/10 22:24:09]

s/adjustedPageLocation/locationInContents

[Navid Zolghadr, 2016/05/11 18:09:43]

Done.

+            float scaleFactor = 1 / frame->pageZoomFactor();
+            if (scaleFactor != 1.0f) {

[bokan, 2016/05/10 22:24:09]

No need for the check here, just allow scaling by 1 (which should no-op).

[Navid Zolghadr, 2016/05/11 18:09:43]

Done.

+                adjustedPageLocation.scale(scaleFactor, scaleFactor);
+                scrollPosition.scale(scaleFactor, scaleFactor);
+            }
+        }
+    }
+    LayoutPoint clientPoint = adjustedPageLocation - toLayoutSize(scrollPosition);

[bokan, 2016/05/10 22:24:09]

I would do this like so:

locationInContents = frameView->rootFrameToContents(mouseEvent.position());
locationInFrameZoomed = frameView->contentsToFrame(locationInContents);
float scaleFactor = 1 / frame->pageZoomFactor();
locationInFrameZoomed.scale(scaleFactor, scaleFactor)

[Navid Zolghadr, 2016/05/11 18:09:43]

Done.

+
+    // Set up initial values for coordinates.
+    // Set up initial values for coordinates.
+    pointerEventInit.setClientX(clientPoint.x().toInt());
+    pointerEventInit.setClientY(clientPoint.y().toInt());
 
     if (pointerEventName == EventTypeNames::pointerdown
         || pointerEventName == EventTypeNames::pointerup) {
         pointerEventInit.setButton(mouseEvent.button());
     } else {
         // TODO(crbug.com/587955): We are setting NoButton for transition
         // pointerevents should be resolved as part of this bug
         pointerEventInit.setButton(NoButton);
     }
     pointerEventInit.setPressure(getPointerEventPressure(
@@ skipping 248 matching lines @@
     if (properties.pointerType
         == WebPointerProperties::PointerType::Mouse)
         return PointerEventFactory::s_mouseId;
     IncomingId id(properties.pointerType, properties.id);
     if (m_pointerIncomingIdMapping.contains(id))
         return m_pointerIncomingIdMapping.get(id);
     return PointerEventFactory::s_invalidId;
 }
 
 } // namespace blink