Diff
Modified: trunk/Source/WebCore/ChangeLog (260980 => 260981)
--- trunk/Source/WebCore/ChangeLog 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebCore/ChangeLog 2020-05-01 03:48:29 UTC (rev 260981)
@@ -1,3 +1,56 @@
+2020-04-30 Simon Fraser <[email protected]>
+
+ Clean up some EventHandler coordinate-related naming and fix ScrollableArea::lastKnownMousePosition() conversions
+ https://bugs.webkit.org/show_bug.cgi?id=211259
+
+ Reviewed by Zalan Bujtas.
+
+ On EventHandler, rename m_lastKnownMousePosition, m_mouseDownPos and m_mouseDown for clarity.
+
+ Rename ScrollableArea::lastKnownMousePosition() to be lastKnownMousePositionInView().
+ Previously, lastKnownMousePosition() would fetch it from EventHandler, which simply stashed
+ event.position() (which is in a coordinate system that differs between WK1 and Wk2) which
+ was not relative to the EventHandler's frame. This cause mouseLocationInScrollerForScrollerImp:
+ to give wrong answers.
+
+ Instead, lastKnownMousePositionInView() now specifically returns coordinates relative to the Frame.
+ This behavior change will be tested in future overlay scrollbar tests.
+
+ Document::showPlaybackTargetPicker() was using FrameView::lastKnownMousePosition(), so to avoid
+ changing its (probably broken) behavior, have it call frame()->eventHandler().lastKnownMousePosition().
+
+ * dom/Document.cpp:
+ (WebCore::Document::showPlaybackTargetPicker):
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::clear):
+ (WebCore::EventHandler::handleMousePressEvent):
+ (WebCore::EventHandler::handleMouseDraggedEvent):
+ (WebCore::EventHandler::updateDragSourceActionsAllowed const):
+ (WebCore::EventHandler::dispatchDragStartEventOnSourceElement):
+ (WebCore::EventHandler::handleDrag):
+ (WebCore::EventHandler::mouseMovementExceedsThreshold const):
+ * page/EventHandler.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::lastKnownMousePositionInView const):
+ (WebCore::FrameView::lastKnownMousePosition const): Deleted.
+ * page/FrameView.h:
+ * platform/PlatformMouseEvent.h:
+ * platform/ScrollableArea.h:
+ (WebCore::ScrollableArea::lastKnownMousePositionInView const):
+ (WebCore::ScrollableArea::lastKnownMousePosition const): Deleted.
+ * platform/mac/ScrollAnimatorMac.mm:
+ (-[WebScrollerImpPairDelegate mouseLocationInContentAreaForScrollerImpPair:]):
+ (-[WebScrollerImpPairDelegate scrollerImpPair:convertContentPoint:toScrollerImp:]):
+ (-[WebScrollerImpDelegate mouseLocationInScrollerForScrollerImp:]):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::lastKnownMousePositionInView const):
+ (WebCore::RenderLayer::lastKnownMousePosition const): Deleted.
+ * rendering/RenderLayer.h:
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::lastKnownMousePositionInView const):
+ (WebCore::RenderListBox::lastKnownMousePosition const): Deleted.
+ * rendering/RenderListBox.h:
+
2020-04-30 Yusuke Suzuki <[email protected]>
Some HTML element critical paths include AtomString materialization
Modified: trunk/Source/WebCore/dom/Document.cpp (260980 => 260981)
--- trunk/Source/WebCore/dom/Document.cpp 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebCore/dom/Document.cpp 2020-05-01 03:48:29 UTC (rev 260981)
@@ -7352,11 +7352,16 @@
if (!page)
return;
+ if (!frame())
+ return;
+
auto it = m_clientToIDMap.find(&client);
if (it == m_clientToIDMap.end())
return;
- page->showPlaybackTargetPicker(it->value, view()->lastKnownMousePosition(), isVideo, routeSharingPolicy, routingContextUID);
+ // FIXME: This is probably wrong for subframes.
+ auto position = frame()->eventHandler().lastKnownMousePosition();
+ page->showPlaybackTargetPicker(it->value, position, isVideo, routeSharingPolicy, routingContextUID);
}
void Document::playbackTargetPickerClientStateDidChange(MediaPlaybackTargetClient& client, MediaProducer::MediaStateFlags state)
Modified: trunk/Source/WebCore/page/EventHandler.cpp (260980 => 260981)
--- trunk/Source/WebCore/page/EventHandler.cpp 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2020-05-01 03:48:29 UTC (rev 260981)
@@ -446,8 +446,8 @@
m_shouldOnlyFireDragOverEvent = false;
#endif
m_mousePositionIsUnknown = true;
- m_lastKnownMousePosition = IntPoint();
- m_lastKnownMouseGlobalPosition = IntPoint();
+ m_lastKnownMousePosition = { };
+ m_lastKnownMouseGlobalPosition = { };
m_mousePressNode = nullptr;
m_mousePressed = false;
m_capturesDragging = false;
@@ -788,7 +788,7 @@
m_mouseDownWasSingleClickInSelection = false;
- m_mouseDown = event.event();
+ m_mouseDownEvent = event.event();
if (m_immediateActionStage != ImmediateActionStage::PerformedHitTest)
m_immediateActionStage = ImmediateActionStage::None;
@@ -906,7 +906,7 @@
}
if (m_selectionInitiationState != ExtendedSelection) {
- HitTestResult result(m_mouseDownPos);
+ HitTestResult result(m_mouseDownContentsPosition);
m_frame.document()->hitTest(HitTestRequest(), result);
updateSelectionForMouseDrag(result);
@@ -1175,7 +1175,7 @@
if (!view)
return DragSourceActionNone;
- return page->dragController().delegateDragSourceAction(view->contentsToRootView(m_mouseDownPos));
+ return page->dragController().delegateDragSourceAction(view->contentsToRootView(m_mouseDownContentsPosition));
}
#endif // ENABLE(DRAG_SUPPORT)
@@ -1725,7 +1725,7 @@
m_mouseDownMayStartSelect = false;
m_mouseDownMayStartAutoscroll = false;
if (FrameView* view = m_frame.view())
- m_mouseDownPos = view->windowToContents(platformMouseEvent.position());
+ m_mouseDownContentsPosition = view->windowToContents(platformMouseEvent.position());
else {
invalidateClick();
return false;
@@ -3695,7 +3695,7 @@
bool EventHandler::dispatchDragStartEventOnSourceElement(DataTransfer& dataTransfer)
{
- return !dispatchDragEvent(eventNames().dragstartEvent, *dragState().source, m_mouseDown, dataTransfer) && !m_frame.selection().selection().isInPasswordField();
+ return !dispatchDragEvent(eventNames().dragstartEvent, *dragState().source, m_mouseDownEvent, dataTransfer) && !m_frame.selection().selection().isInPasswordField();
}
static bool ExactlyOneBitSet(DragSourceAction n)
@@ -3729,10 +3729,10 @@
dragState().shouldDispatchEvents = (updateDragSourceActionsAllowed() & DragSourceActionDHTML);
// Try to find an element that wants to be dragged.
- HitTestResult result(m_mouseDownPos);
+ HitTestResult result(m_mouseDownContentsPosition);
m_frame.document()->hitTest(OptionSet<HitTestRequest::RequestType> { HitTestRequest::ReadOnly, HitTestRequest::DisallowUserAgentShadowContent }, result);
if (m_frame.page())
- dragState().source = m_frame.page()->dragController().draggableElement(&m_frame, result.targetElement(), m_mouseDownPos, dragState());
+ dragState().source = m_frame.page()->dragController().draggableElement(&m_frame, result.targetElement(), m_mouseDownContentsPosition, dragState());
if (!dragState().source)
m_mouseDownMayStartDrag = false; // no element is draggable
@@ -3807,7 +3807,7 @@
dragState().source->document().updateStyleIfNeeded();
if (auto* renderer = dragState().source->renderer()) {
auto absolutePosition = renderer->localToAbsolute();
- auto delta = m_mouseDownPos - roundedIntPoint(absolutePosition);
+ auto delta = m_mouseDownContentsPosition - roundedIntPoint(absolutePosition);
dragState().dataTransfer->setDragImage(dragState().source.get(), delta.width(), delta.height());
} else {
dispatchEventToDragSourceElement(eventNames().dragendEvent, event.event());
@@ -3833,7 +3833,7 @@
if (m_mouseDownMayStartDrag) {
Page* page = m_frame.page();
- m_didStartDrag = page && page->dragController().startDrag(m_frame, dragState(), srcOp, event.event(), m_mouseDownPos, hasNonDefaultPasteboardData);
+ m_didStartDrag = page && page->dragController().startDrag(m_frame, dragState(), srcOp, event.event(), m_mouseDownContentsPosition, hasNonDefaultPasteboardData);
// In WebKit2 we could re-enter this code and start another drag.
// On OS X this causes problems with the ownership of the pasteboard and the promised types.
if (m_didStartDrag) {
@@ -3864,7 +3864,7 @@
if (!view)
return false;
IntPoint location = view->windowToContents(flooredIntPoint(viewportLocation));
- IntSize delta = location - m_mouseDownPos;
+ IntSize delta = location - m_mouseDownContentsPosition;
return abs(delta.width()) >= pointsThreshold || abs(delta.height()) >= pointsThreshold;
}
Modified: trunk/Source/WebCore/page/EventHandler.h (260980 => 260981)
--- trunk/Source/WebCore/page/EventHandler.h 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebCore/page/EventHandler.h 2020-05-01 03:48:29 UTC (rev 260981)
@@ -179,6 +179,7 @@
void resizeLayerDestroyed();
+ // FIXME: Each Frame has an EventHandler, and not every event goes to all frames, so this position can be stale. It should probably be stored on Page.
IntPoint lastKnownMousePosition() const;
IntPoint lastKnownMouseGlobalPosition() const { return m_lastKnownMouseGlobalPosition; }
Cursor currentMouseCursor() const { return m_currentMouseCursor; }
@@ -587,11 +588,11 @@
LayoutSize m_offsetFromResizeCorner; // In the coords of m_resizeLayer.
bool m_mousePositionIsUnknown { true };
- IntPoint m_lastKnownMousePosition;
+ IntPoint m_lastKnownMousePosition; // Same coordinates as PlatformMouseEvent::position().
IntPoint m_lastKnownMouseGlobalPosition;
- IntPoint m_mouseDownPos; // In our view's coords.
+ IntPoint m_mouseDownContentsPosition;
WallTime m_mouseDownTimestamp;
- PlatformMouseEvent m_mouseDown;
+ PlatformMouseEvent m_mouseDownEvent;
PlatformMouseEvent m_lastPlatformMouseEvent;
#if PLATFORM(COCOA)
Modified: trunk/Source/WebCore/page/FrameView.cpp (260980 => 260981)
--- trunk/Source/WebCore/page/FrameView.cpp 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebCore/page/FrameView.cpp 2020-05-01 03:48:29 UTC (rev 260981)
@@ -2012,9 +2012,9 @@
return frame().settings().fixedElementsLayoutRelativeToFrame();
}
-IntPoint FrameView::lastKnownMousePosition() const
+IntPoint FrameView::lastKnownMousePositionInView() const
{
- return frame().eventHandler().lastKnownMousePosition();
+ return convertFromContainingWindow(frame().eventHandler().lastKnownMousePosition());
}
bool FrameView::isHandlingWheelEvent() const
Modified: trunk/Source/WebCore/page/FrameView.h (260980 => 260981)
--- trunk/Source/WebCore/page/FrameView.h 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebCore/page/FrameView.h 2020-05-01 03:48:29 UTC (rev 260981)
@@ -520,7 +520,7 @@
enum ScrollbarModesCalculationStrategy { RulesFromWebContentOnly, AnyRule };
void calculateScrollbarModesForLayout(ScrollbarMode& hMode, ScrollbarMode& vMode, ScrollbarModesCalculationStrategy = AnyRule);
- IntPoint lastKnownMousePosition() const final;
+ IntPoint lastKnownMousePositionInView() const final;
bool isHandlingWheelEvent() const final;
bool shouldSetCursor() const;
Modified: trunk/Source/WebCore/platform/PlatformMouseEvent.h (260980 => 260981)
--- trunk/Source/WebCore/platform/PlatformMouseEvent.h 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebCore/platform/PlatformMouseEvent.h 2020-05-01 03:48:29 UTC (rev 260981)
@@ -61,6 +61,8 @@
{
}
+ // This position is relative to the enclosing NSWindow in WebKit1, and is WKWebView-relative in WebKit2.
+ // Use ScrollView::windowToContents() to convert it to into the contents of a given view.
const IntPoint& position() const { return m_position; }
const IntPoint& globalPosition() const { return m_globalPosition; }
#if ENABLE(POINTER_LOCK)
Modified: trunk/Source/WebCore/platform/ScrollableArea.h (260980 => 260981)
--- trunk/Source/WebCore/platform/ScrollableArea.h 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2020-05-01 03:48:29 UTC (rev 260981)
@@ -277,7 +277,7 @@
virtual IntSize contentsSize() const = 0;
virtual IntSize overhangAmount() const { return IntSize(); }
- virtual IntPoint lastKnownMousePosition() const { return IntPoint(); }
+ virtual IntPoint lastKnownMousePositionInView() const { return IntPoint(); }
virtual bool isHandlingWheelEvent() const { return false; }
virtual int headerHeight() const { return 0; }
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (260980 => 260981)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2020-05-01 03:48:29 UTC (rev 260981)
@@ -224,7 +224,9 @@
if (!_scrollableArea)
return NSZeroPoint;
- return _scrollableArea->lastKnownMousePosition();
+ // It's OK that this position isn't relative to this scroller (which might be an overflow scroller).
+ // AppKit just takes the result and passes it back to -scrollerImpPair:convertContentPoint:toScrollerImp:.
+ return _scrollableArea->lastKnownMousePositionInView();
}
- (NSPoint)scrollerImpPair:(NSScrollerImpPair *)scrollerImpPair convertContentPoint:(NSPoint)pointInContentArea toScrollerImp:(NSScrollerImp *)scrollerImp
@@ -250,7 +252,7 @@
ASSERT(scrollerImp == scrollerImpForScrollbar(*scrollbar));
- return scrollbar->convertFromContainingView(WebCore::IntPoint(pointInContentArea));
+ return scrollbar->convertFromContainingView(WebCore::roundedIntPoint(pointInContentArea));
}
- (void)scrollerImpPair:(NSScrollerImpPair *)scrollerImpPair setContentAreaNeedsDisplayInRect:(NSRect)rect
@@ -513,7 +515,8 @@
ASSERT_UNUSED(scrollerImp, scrollerImp == scrollerImpForScrollbar(*_scrollbar));
- return _scrollbar->convertFromContainingView(_scrollbar->scrollableArea().lastKnownMousePosition());
+ auto positionInView = _scrollbar->scrollableArea().lastKnownMousePositionInView();
+ return _scrollbar->convertFromContainingView(positionInView);
}
- (NSRect)convertRectToLayer:(NSRect)rect
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (260980 => 260981)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2020-05-01 03:48:29 UTC (rev 260981)
@@ -3283,9 +3283,9 @@
}
#endif
-IntPoint RenderLayer::lastKnownMousePosition() const
+IntPoint RenderLayer::lastKnownMousePositionInView() const
{
- return renderer().frame().eventHandler().lastKnownMousePosition();
+ return renderer().view().frameView().lastKnownMousePositionInView();
}
bool RenderLayer::isHandlingWheelEvent() const
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (260980 => 260981)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2020-05-01 03:48:29 UTC (rev 260981)
@@ -1125,7 +1125,7 @@
IntRect visibleContentRectInternal(VisibleContentRectIncludesScrollbars, VisibleContentRectBehavior) const final;
IntSize overhangAmount() const final;
- IntPoint lastKnownMousePosition() const final;
+ IntPoint lastKnownMousePositionInView() const final;
bool isHandlingWheelEvent() const final;
bool shouldSuspendScrollAnimations() const final;
IntRect scrollableAreaBoundingBox(bool* isInsideFixed = nullptr) const final;
Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (260980 => 260981)
--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2020-05-01 03:48:29 UTC (rev 260981)
@@ -856,9 +856,9 @@
return IntSize(scrollWidth(), scrollHeight());
}
-IntPoint RenderListBox::lastKnownMousePosition() const
+IntPoint RenderListBox::lastKnownMousePositionInView() const
{
- return view().frameView().lastKnownMousePosition();
+ return view().frameView().lastKnownMousePositionInView();
}
bool RenderListBox::isHandlingWheelEvent() const
Modified: trunk/Source/WebCore/rendering/RenderListBox.h (260980 => 260981)
--- trunk/Source/WebCore/rendering/RenderListBox.h 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebCore/rendering/RenderListBox.h 2020-05-01 03:48:29 UTC (rev 260981)
@@ -130,7 +130,7 @@
Scrollbar* verticalScrollbar() const final { return m_vBar.get(); }
IntSize contentsSize() const final;
IntSize visibleSize() const final { return IntSize(width(), height()); }
- IntPoint lastKnownMousePosition() const final;
+ IntPoint lastKnownMousePositionInView() const final;
bool isHandlingWheelEvent() const final;
bool shouldSuspendScrollAnimations() const final;
bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const final;
Modified: trunk/Source/WebKit/ChangeLog (260980 => 260981)
--- trunk/Source/WebKit/ChangeLog 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebKit/ChangeLog 2020-05-01 03:48:29 UTC (rev 260981)
@@ -1,3 +1,16 @@
+2020-04-30 Simon Fraser <[email protected]>
+
+ Clean up some EventHandler coordinate-related naming and fix ScrollableArea::lastKnownMousePosition() conversions
+ https://bugs.webkit.org/show_bug.cgi?id=211259
+
+ Reviewed by Zalan Bujtas.
+
+ * Shared/WebEvent.h:
+ (WebKit::WebMouseEvent::position const):
+ * Shared/WebMouseEvent.cpp:
+ (WebKit::WebMouseEvent::WebMouseEvent):
+ * WebProcess/Plugins/PDF/PDFPlugin.h:
+
2020-04-30 David Kilzer <[email protected]>
[iOS] Fix confusing idiom for releasing _selectionRects in -[WKTextRange dealloc]
Modified: trunk/Source/WebKit/Shared/WebEvent.h (260980 => 260981)
--- trunk/Source/WebKit/Shared/WebEvent.h 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebKit/Shared/WebEvent.h 2020-05-01 03:48:29 UTC (rev 260981)
@@ -140,14 +140,14 @@
WebMouseEvent();
#if PLATFORM(MAC)
- WebMouseEvent(Type, Button, unsigned short buttons, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, OptionSet<Modifier>, WallTime timestamp, double force, SyntheticClickType = NoTap, int eventNumber = -1, int menuType = 0);
+ WebMouseEvent(Type, Button, unsigned short buttons, const WebCore::IntPoint& positionInView, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, OptionSet<Modifier>, WallTime timestamp, double force, SyntheticClickType = NoTap, int eventNumber = -1, int menuType = 0);
#else
- WebMouseEvent(Type, Button, unsigned short buttons, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, OptionSet<Modifier>, WallTime timestamp, double force = 0, SyntheticClickType = NoTap);
+ WebMouseEvent(Type, Button, unsigned short buttons, const WebCore::IntPoint& positionInView, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, OptionSet<Modifier>, WallTime timestamp, double force = 0, SyntheticClickType = NoTap);
#endif
Button button() const { return static_cast<Button>(m_button); }
unsigned short buttons() const { return m_buttons; }
- const WebCore::IntPoint& position() const { return m_position; }
+ const WebCore::IntPoint& position() const { return m_position; } // Relative to the view.
const WebCore::IntPoint& globalPosition() const { return m_globalPosition; }
float deltaX() const { return m_deltaX; }
float deltaY() const { return m_deltaY; }
@@ -168,7 +168,7 @@
uint32_t m_button { static_cast<uint32_t>(NoButton) };
unsigned short m_buttons { 0 };
- WebCore::IntPoint m_position;
+ WebCore::IntPoint m_position; // Relative to the view.
WebCore::IntPoint m_globalPosition;
float m_deltaX { 0 };
float m_deltaY { 0 };
Modified: trunk/Source/WebKit/Shared/WebMouseEvent.cpp (260980 => 260981)
--- trunk/Source/WebKit/Shared/WebMouseEvent.cpp 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebKit/Shared/WebMouseEvent.cpp 2020-05-01 03:48:29 UTC (rev 260981)
@@ -34,14 +34,14 @@
WebMouseEvent::WebMouseEvent() = default;
#if PLATFORM(MAC)
-WebMouseEvent::WebMouseEvent(Type type, Button button, unsigned short buttons, const IntPoint& position, const IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, OptionSet<Modifier> modifiers, WallTime timestamp, double force, SyntheticClickType syntheticClickType, int eventNumber, int menuType)
+WebMouseEvent::WebMouseEvent(Type type, Button button, unsigned short buttons, const IntPoint& positionInView, const IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, OptionSet<Modifier> modifiers, WallTime timestamp, double force, SyntheticClickType syntheticClickType, int eventNumber, int menuType)
#else
-WebMouseEvent::WebMouseEvent(Type type, Button button, unsigned short buttons, const IntPoint& position, const IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, OptionSet<Modifier> modifiers, WallTime timestamp, double force, SyntheticClickType syntheticClickType)
+WebMouseEvent::WebMouseEvent(Type type, Button button, unsigned short buttons, const IntPoint& positionInView, const IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, OptionSet<Modifier> modifiers, WallTime timestamp, double force, SyntheticClickType syntheticClickType)
#endif
: WebEvent(type, modifiers, timestamp)
, m_button(button)
, m_buttons(buttons)
- , m_position(position)
+ , m_position(positionInView)
, m_globalPosition(globalPosition)
, m_deltaX(deltaX)
, m_deltaY(deltaY)
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.h (260980 => 260981)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.h 2020-05-01 03:26:21 UTC (rev 260980)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.h 2020-05-01 03:48:29 UTC (rev 260981)
@@ -230,7 +230,7 @@
void setScrollOffset(const WebCore::ScrollOffset&) final;
void invalidateScrollbarRect(WebCore::Scrollbar&, const WebCore::IntRect&) final;
void invalidateScrollCornerRect(const WebCore::IntRect&) final;
- WebCore::IntPoint lastKnownMousePosition() const final { return m_lastMousePositionInPluginCoordinates; }
+ WebCore::IntPoint lastKnownMousePositionInView() const final { return m_lastMousePositionInPluginCoordinates; }
bool isActive() const final;
bool isScrollCornerVisible() const final { return false; }
WebCore::ScrollPosition scrollPosition() const final;
