Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/page/EventHandler.cpp (282545 => 282546)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/page/EventHandler.cpp 2021-09-16 10:55:46 UTC (rev 282545)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/page/EventHandler.cpp 2021-09-16 10:59:40 UTC (rev 282546)
@@ -485,7 +485,7 @@
void EventHandler::selectClosestWordFromHitTestResult(const HitTestResult& result, AppendTrailingWhitespace appendTrailingWhitespace)
{
- Node* targetNode = result.targetNode();
+ RefPtr targetNode = result.targetNode();
VisibleSelection newSelection;
if (targetNode && targetNode->renderer()) {
@@ -498,7 +498,7 @@
if (appendTrailingWhitespace == ShouldAppendTrailingWhitespace && newSelection.isRange())
newSelection.appendTrailingWhitespace();
- updateSelectionForMouseDownDispatchingSelectStart(targetNode, expandSelectionToRespectSelectOnMouseDown(*targetNode, newSelection), TextGranularity::WordGranularity);
+ updateSelectionForMouseDownDispatchingSelectStart(targetNode.get(), expandSelectionToRespectSelectOnMouseDown(*targetNode, newSelection), TextGranularity::WordGranularity);
}
}
@@ -522,7 +522,7 @@
void EventHandler::selectClosestContextualWordFromMouseEvent(const MouseEventWithHitTestResults& mouseEvent)
{
- Node* targetNode = mouseEvent.targetNode();
+ RefPtr targetNode = mouseEvent.targetNode();
const HitTestResult& result = mouseEvent.hitTestResult();
VisibleSelection newSelection;
bool appendTrailingWhitespace = shouldAppendTrailingWhitespace(mouseEvent, m_frame);
@@ -540,15 +540,15 @@
if (appendTrailingWhitespace == ShouldAppendTrailingWhitespace && newSelection.isRange())
newSelection.appendTrailingWhitespace();
- updateSelectionForMouseDownDispatchingSelectStart(targetNode, expandSelectionToRespectSelectOnMouseDown(*targetNode, newSelection), TextGranularity::WordGranularity);
+ updateSelectionForMouseDownDispatchingSelectStart(targetNode.get(), expandSelectionToRespectSelectOnMouseDown(*targetNode, newSelection), TextGranularity::WordGranularity);
}
}
void EventHandler::selectClosestContextualWordOrLinkFromMouseEvent(const MouseEventWithHitTestResults& result)
{
- Element* urlElement = result.hitTestResult().URLElement();
+ RefPtr urlElement = result.hitTestResult().URLElement();
if (!urlElement || !isDraggableLink(*urlElement)) {
- if (Node* targetNode = result.targetNode()) {
+ if (RefPtr targetNode = result.targetNode()) {
if (isEditableNode(*targetNode))
return selectClosestWordFromMouseEvent(result);
}
@@ -556,15 +556,14 @@
return selectClosestContextualWordFromMouseEvent(result);
}
- Node* targetNode = result.targetNode();
-
+ RefPtr targetNode = result.targetNode();
if (targetNode && targetNode->renderer() && mouseDownMayStartSelect()) {
VisibleSelection newSelection;
VisiblePosition pos(targetNode->renderer()->positionForPoint(result.localPoint(), nullptr));
if (pos.isNotNull() && pos.deepEquivalent().deprecatedNode()->isDescendantOf(*urlElement))
- newSelection = VisibleSelection::selectionFromContentsOfNode(urlElement);
+ newSelection = VisibleSelection::selectionFromContentsOfNode(urlElement.get());
- updateSelectionForMouseDownDispatchingSelectStart(targetNode, expandSelectionToRespectSelectOnMouseDown(*targetNode, newSelection), TextGranularity::WordGranularity);
+ updateSelectionForMouseDownDispatchingSelectStart(targetNode.get(), expandSelectionToRespectSelectOnMouseDown(*targetNode, newSelection), TextGranularity::WordGranularity);
}
}
@@ -591,7 +590,7 @@
if (event.event().button() != LeftButton)
return false;
- Node* targetNode = event.targetNode();
+ RefPtr targetNode = event.targetNode();
if (!(targetNode && targetNode->renderer() && mouseDownMayStartSelect()))
return false;
@@ -602,7 +601,7 @@
newSelection.expandUsingGranularity(TextGranularity::ParagraphGranularity);
}
- return updateSelectionForMouseDownDispatchingSelectStart(targetNode, expandSelectionToRespectSelectOnMouseDown(*targetNode, newSelection), TextGranularity::ParagraphGranularity);
+ return updateSelectionForMouseDownDispatchingSelectStart(targetNode.get(), expandSelectionToRespectSelectOnMouseDown(*targetNode, newSelection), TextGranularity::ParagraphGranularity);
}
static uint64_t textDistance(const Position& start, const Position& end)
@@ -618,7 +617,7 @@
Ref<Frame> protectedFrame(m_frame);
m_frame.document()->updateLayoutIgnorePendingStylesheets();
- Node* targetNode = event.targetNode();
+ RefPtr targetNode = event.targetNode();
if (!targetNode || !targetNode->renderer() || !mouseDownMayStartSelect() || m_mouseDownDelegatedFocus)
return false;
@@ -637,7 +636,7 @@
VisiblePosition visiblePosition(targetNode->renderer()->positionForPoint(event.localPoint(), nullptr));
if (visiblePosition.isNull())
- visiblePosition = VisiblePosition(firstPositionInOrBeforeNode(targetNode));
+ visiblePosition = VisiblePosition(firstPositionInOrBeforeNode(targetNode.get()));
Position pos = visiblePosition.deepEquivalent();
VisibleSelection newSelection = m_frame.selection().selection();
@@ -682,7 +681,7 @@
newSelection = expandSelectionToRespectSelectOnMouseDown(*targetNode, visiblePosition);
}
- bool handled = updateSelectionForMouseDownDispatchingSelectStart(targetNode, newSelection, granularity);
+ bool handled = updateSelectionForMouseDownDispatchingSelectStart(targetNode.get(), newSelection, granularity);
if (event.event().button() == MiddleButton) {
// Ignore handled, since we want to paste to where the caret was placed anyway.
@@ -801,11 +800,12 @@
VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const VisibleSelection& selection, const LayoutPoint& localPoint, Node* targetNode)
{
FloatPoint selectionEndPoint = localPoint;
- Element* editableElement = selection.rootEditableElement();
+ RefPtr editableElement = selection.rootEditableElement();
if (!targetNode || !targetNode->renderer())
return VisiblePosition();
+ RefPtr adjustedTarget = targetNode;
if (editableElement && !editableElement->contains(targetNode)) {
if (!editableElement->renderer())
return VisiblePosition();
@@ -812,10 +812,10 @@
FloatPoint absolutePoint = targetNode->renderer()->localToAbsolute(FloatPoint(selectionEndPoint));
selectionEndPoint = editableElement->renderer()->absoluteToLocal(absolutePoint);
- targetNode = editableElement;
+ adjustedTarget = editableElement;
}
- return targetNode->renderer()->positionForPoint(LayoutPoint(selectionEndPoint), nullptr);
+ return adjustedTarget->renderer()->positionForPoint(LayoutPoint(selectionEndPoint), nullptr);
}
#if ENABLE(DRAG_SUPPORT)
@@ -844,13 +844,13 @@
if (handleDrag(event, checkDragHysteresis))
return true;
- Node* targetNode = event.targetNode();
+ RefPtr targetNode = event.targetNode();
if (event.event().button() != LeftButton || !targetNode)
return false;
RenderObject* renderer = targetNode->renderer();
if (!renderer) {
- Element* parent = targetNode->parentOrShadowHostElement();
+ RefPtr parent = targetNode->parentOrShadowHostElement();
if (!parent)
return false;
@@ -907,8 +907,8 @@
HitTestResult result(view->windowToContents(event.position()));
document->hitTest(hitType, result);
DragState state;
- Element* targetElement = result.targetElement();
- return targetElement && page->dragController().draggableElement(&m_frame, targetElement, result.roundedPointInInnerNodeFrame(), state);
+ RefPtr targetElement = result.targetElement();
+ return targetElement && page->dragController().draggableElement(&m_frame, targetElement.get(), result.roundedPointInInnerNodeFrame(), state);
}
void EventHandler::updateSelectionForMouseDrag()
@@ -937,7 +937,7 @@
if (!mouseDownMayStartSelect())
return;
- Node* target = hitTestResult.targetNode();
+ RefPtr target = hitTestResult.targetNode();
if (!target)
return;
@@ -944,7 +944,7 @@
if (!HTMLElement::shouldUpdateSelectionForMouseDrag(*target, m_frame.selection().selection()))
return;
- VisiblePosition targetPosition = selectionExtentRespectingEditingBoundary(m_frame.selection().selection(), hitTestResult.localPoint(), target);
+ VisiblePosition targetPosition = selectionExtentRespectingEditingBoundary(m_frame.selection().selection(), hitTestResult.localPoint(), target.get());
// Don't modify the selection if we're not on a node.
if (targetPosition.isNull())
@@ -956,7 +956,7 @@
// Special case to limit selection to the containing block for SVG text.
// FIXME: Isn't there a better non-SVG-specific way to do this?
- if (Node* selectionBaseNode = newSelection.base().deprecatedNode()) {
+ if (RefPtr selectionBaseNode = newSelection.base().deprecatedNode()) {
if (RenderObject* selectionBaseRenderer = selectionBaseNode->renderer()) {
if (selectionBaseRenderer->isSVGText()) {
if (target->renderer()->containingBlock() != selectionBaseRenderer->containingBlock())
@@ -966,7 +966,7 @@
}
- if (m_selectionInitiationState == HaveNotStartedSelection && !dispatchSelectStart(target)) {
+ if (m_selectionInitiationState == HaveNotStartedSelection && !dispatchSelectStart(target.get())) {
m_mouseDownMayStartSelect = false;
return;
}
@@ -977,20 +977,20 @@
newSelection = VisibleSelection(targetPosition);
}
- Node* rootUserSelectAllForMousePressNode = Position::rootUserSelectAllForNode(m_mousePressNode.get());
- if (rootUserSelectAllForMousePressNode && rootUserSelectAllForMousePressNode == Position::rootUserSelectAllForNode(target)) {
- newSelection.setBase(positionBeforeNode(rootUserSelectAllForMousePressNode).upstream(CanCrossEditingBoundary));
- newSelection.setExtent(positionAfterNode(rootUserSelectAllForMousePressNode).downstream(CanCrossEditingBoundary));
+ RefPtr rootUserSelectAllForMousePressNode = Position::rootUserSelectAllForNode(m_mousePressNode.get());
+ if (rootUserSelectAllForMousePressNode && rootUserSelectAllForMousePressNode == Position::rootUserSelectAllForNode(target.get())) {
+ newSelection.setBase(positionBeforeNode(rootUserSelectAllForMousePressNode.get()).upstream(CanCrossEditingBoundary));
+ newSelection.setExtent(positionAfterNode(rootUserSelectAllForMousePressNode.get()).downstream(CanCrossEditingBoundary));
} else {
// Reset base for user select all when base is inside user-select-all area and extent < base.
if (rootUserSelectAllForMousePressNode && target->renderer()->positionForPoint(hitTestResult.localPoint(), nullptr) < m_mousePressNode->renderer()->positionForPoint(m_dragStartPosition, nullptr))
- newSelection.setBase(positionAfterNode(rootUserSelectAllForMousePressNode).downstream(CanCrossEditingBoundary));
+ newSelection.setBase(positionAfterNode(rootUserSelectAllForMousePressNode.get()).downstream(CanCrossEditingBoundary));
- Node* rootUserSelectAllForTarget = Position::rootUserSelectAllForNode(target);
+ RefPtr rootUserSelectAllForTarget = Position::rootUserSelectAllForNode(target.get());
if (rootUserSelectAllForTarget && m_mousePressNode->renderer() && target->renderer()->positionForPoint(hitTestResult.localPoint(), nullptr) < m_mousePressNode->renderer()->positionForPoint(m_dragStartPosition, nullptr))
- newSelection.setExtent(positionBeforeNode(rootUserSelectAllForTarget).upstream(CanCrossEditingBoundary));
+ newSelection.setExtent(positionBeforeNode(rootUserSelectAllForTarget.get()).upstream(CanCrossEditingBoundary));
else if (rootUserSelectAllForTarget && m_mousePressNode->renderer())
- newSelection.setExtent(positionAfterNode(rootUserSelectAllForTarget).downstream(CanCrossEditingBoundary));
+ newSelection.setExtent(positionAfterNode(rootUserSelectAllForTarget.get()).downstream(CanCrossEditingBoundary));
else
newSelection.setExtent(targetPosition);
}
@@ -1055,7 +1055,7 @@
&& m_frame.selection().isRange()
&& event.event().button() != RightButton) {
VisibleSelection newSelection;
- Node* node = event.targetNode();
+ RefPtr node = event.targetNode();
bool caretBrowsing = m_frame.settings().caretBrowsingEnabled();
bool allowSelectionChanges = true;
if (node && node->renderer() && (caretBrowsing || node->hasEditableStyle())) {
@@ -1152,12 +1152,10 @@
// We always send hitTestResultAtPoint to the main frame if we have one,
// otherwise we might hit areas that are obscured by higher frames.
if (!m_frame.isMainFrame()) {
- Frame& mainFrame = m_frame.mainFrame();
- FrameView* frameView = m_frame.view();
- FrameView* mainView = mainFrame.view();
- if (frameView && mainView) {
+ Ref mainFrame = m_frame.mainFrame();
+ if (RefPtr frameView = m_frame.view(), mainView = mainFrame->view(); frameView && mainView) {
IntPoint mainFramePoint = mainView->rootViewToContents(frameView->contentsToRootView(roundedIntPoint(point)));
- return mainFrame.eventHandler().hitTestResultAtPoint(mainFramePoint, hitType, padding);
+ return mainFrame->eventHandler().hitTestResultAtPoint(mainFramePoint, hitType);
}
}
@@ -1165,11 +1163,11 @@
unsigned nonNegativePaddingHeight = std::max<LayoutUnit>(0, padding.height()).toUnsigned();
// We should always start hit testing a clean tree.
- if (auto* frameView = m_frame.view())
+ if (RefPtr frameView = m_frame.view())
frameView->updateLayoutAndStyleIfNeededRecursive();
HitTestResult result(point, nonNegativePaddingHeight, nonNegativePaddingWidth, nonNegativePaddingHeight, nonNegativePaddingWidth);
- auto* document = m_frame.document();
+ RefPtr document = m_frame.document();
if (!document)
return result;
@@ -1191,7 +1189,7 @@
bool EventHandler::scrollOverflow(ScrollDirection direction, ScrollGranularity granularity, Node* startingNode)
{
- Node* node = startingNode;
+ RefPtr node = startingNode;
if (!node)
node = m_frame.document()->focusedElement();
@@ -1212,7 +1210,7 @@
bool EventHandler::logicalScrollOverflow(ScrollLogicalDirection direction, ScrollGranularity granularity, Node* startingNode)
{
- Node* node = startingNode;
+ RefPtr node = startingNode;
if (!node)
node = m_frame.document()->focusedElement();
@@ -1240,8 +1238,8 @@
m_frame.document()->updateLayoutIgnorePendingStylesheets();
if (scrollOverflow(direction, granularity, startingNode))
return true;
- Frame* frame = &m_frame;
- FrameView* view = frame->view();
+ RefPtr frame = &m_frame;
+ RefPtr view = frame->view();
if (view && view->scroll(direction, granularity))
return true;
frame = frame->tree().parent();
@@ -1259,8 +1257,8 @@
m_frame.document()->updateLayoutIgnorePendingStylesheets();
if (logicalScrollOverflow(direction, granularity, startingNode))
return true;
- Frame* frame = &m_frame;
- FrameView* view = frame->view();
+ RefPtr frame = &m_frame;
+ RefPtr view = frame->view();
bool scrolled = false;
#if PLATFORM(COCOA)
@@ -1273,7 +1271,7 @@
if (scrolled)
return true;
-
+
frame = frame->tree().parent();
if (!frame)
return false;
@@ -1369,11 +1367,11 @@
return;
}
- FrameView* view = m_frame.view();
+ RefPtr view = m_frame.view();
if (!view)
return;
- auto* document = m_frame.document();
+ RefPtr document = m_frame.document();
if (!document)
return;
@@ -1424,7 +1422,7 @@
return pointerCursor();
}
- Node* node = result.targetNode();
+ RefPtr node = result.targetNode();
if (!node)
return WTF::nullopt;
@@ -1501,7 +1499,7 @@
case CursorType::Auto: {
bool editable = node->hasEditableStyle();
- if (useHandCursor(node, result.isOverLink(), shiftKey))
+ if (useHandCursor(node.get(), result.isOverLink(), shiftKey))
return handCursor();
bool inResizer = false;
@@ -1730,7 +1728,7 @@
#if ENABLE(PAN_SCROLLING)
// We store whether pan scrolling is in progress before calling stopAutoscrollTimer()
// because it will set m_autoscrollType to NoAutoscroll on return.
- bool isPanScrollInProgress = m_frame.mainFrame().eventHandler().panScrollInProgress();
+ bool isPanScrollInProgress = Ref(m_frame.mainFrame())->eventHandler().panScrollInProgress();
stopAutoscrollTimer();
if (isPanScrollInProgress) {
// We invalidate the click when exiting pan scrolling so that we don't inadvertently navigate
@@ -2005,7 +2003,7 @@
}
if (!newSubframe || mouseEvent.scrollbar()) {
- if (auto* view = m_frame.view())
+ if (RefPtr view = m_frame.view())
updateCursor(*view, mouseEvent.hitTestResult(), platformMouseEvent.shiftKey());
}
@@ -2268,13 +2266,12 @@
return dragState().source.get();
}
-static bool targetIsFrame(Node* target, Frame*& frame)
+static std::pair<bool, RefPtr<Frame>> contentFrameForNode(Node* target)
{
if (!is<HTMLFrameElementBase>(target))
- return false;
+ return { false, nullptr };
- frame = downcast<HTMLFrameElementBase>(*target).contentFrame();
- return true;
+ return { true, downcast<HTMLFrameElementBase>(*target).contentFrame() };
}
static Optional<DragOperation> convertDropZoneOperationToDragOperation(const String& dragOperation)
@@ -2360,12 +2357,12 @@
MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(hitType, event);
RefPtr<Element> newTarget;
- if (Node* targetNode = mouseEvent.targetNode()) {
+ if (RefPtr targetNode = mouseEvent.targetNode()) {
// Drag events should never go to non-element nodes (following IE, and proper mouseover/out dispatch)
if (!is<Element>(*targetNode))
newTarget = targetNode->parentOrShadowHostElement();
else
- newTarget = downcast<Element>(targetNode);
+ newTarget = static_pointer_cast<Element>(WTFMove(targetNode));
}
m_autoscrollController->updateDragAndDrop(newTarget.get(), event.position(), event.timestamp());
@@ -2377,8 +2374,7 @@
// LayoutTests/fast/events/drag-in-frames.html.
//
// Moreover, this ordering conforms to section 7.9.4 of the HTML 5 spec. <http://dev.w3.org/html5/spec/Overview.html#drag-and-drop-processing-model>.
- Frame* targetFrame;
- if (targetIsFrame(newTarget.get(), targetFrame)) {
+ if (auto [isFrameOwner, targetFrame] = contentFrameForNode(newTarget.get()); isFrameOwner) {
if (targetFrame)
response = targetFrame->eventHandler().updateDragAndDrop(event, makePasteboard, sourceOperationMask, draggingFiles);
} else if (newTarget) {
@@ -2387,7 +2383,7 @@
response = dispatchDragEnterOrDragOverEvent(eventNames().dragenterEvent, *newTarget, event, makePasteboard(), sourceOperationMask, draggingFiles);
}
- if (targetIsFrame(m_dragTarget.get(), targetFrame)) {
+ if (auto [isFrameOwner, targetFrame] = contentFrameForNode(m_dragTarget.get()); isFrameOwner) {
// FIXME: Recursing again here doesn't make sense if the newTarget and m_dragTarget were in the same frame.
if (targetFrame)
response = targetFrame->eventHandler().updateDragAndDrop(event, makePasteboard, sourceOperationMask, draggingFiles);
@@ -2403,8 +2399,7 @@
m_shouldOnlyFireDragOverEvent = true;
}
} else {
- Frame* targetFrame;
- if (targetIsFrame(newTarget.get(), targetFrame)) {
+ if (auto [isFrameOwner, targetFrame] = contentFrameForNode(newTarget.get()); isFrameOwner) {
if (targetFrame)
response = targetFrame->eventHandler().updateDragAndDrop(event, makePasteboard, sourceOperationMask, draggingFiles);
} else if (newTarget) {
@@ -2423,8 +2418,7 @@
{
Ref<Frame> protectedFrame(m_frame);
- Frame* targetFrame;
- if (targetIsFrame(m_dragTarget.get(), targetFrame)) {
+ if (auto [isFrameOwner, targetFrame] = contentFrameForNode(m_dragTarget.get()); isFrameOwner) {
if (targetFrame)
targetFrame->eventHandler().cancelDragAndDrop(event, WTFMove(pasteboard), sourceOperationMask, draggingFiles);
} else if (m_dragTarget) {
@@ -2441,9 +2435,8 @@
{
Ref<Frame> protectedFrame(m_frame);
- Frame* targetFrame;
bool preventedDefault = false;
- if (targetIsFrame(m_dragTarget.get(), targetFrame)) {
+ if (auto [isFrameOwner, targetFrame] = contentFrameForNode(m_dragTarget.get()); isFrameOwner) {
if (targetFrame)
preventedDefault = targetFrame->eventHandler().performDragAndDrop(event, WTFMove(pasteboard), sourceOperationMask, draggingFiles);
} else if (m_dragTarget) {
@@ -2495,7 +2488,7 @@
static bool hierarchyHasCapturingEventListeners(Element* element, const AtomString& pointerEventName, const AtomString& compatibilityMouseEventName)
{
- for (ContainerNode* curr = element; curr; curr = curr->parentInComposedTree()) {
+ for (RefPtr<ContainerNode> curr = element; curr; curr = curr->parentInComposedTree()) {
if (curr->hasCapturingEventListeners(pointerEventName) || curr->hasCapturingEventListeners(compatibilityMouseEventName))
return true;
}
@@ -2505,7 +2498,7 @@
void EventHandler::updateMouseEventTargetNode(const AtomString& eventType, Node* targetNode, const PlatformMouseEvent& platformMouseEvent, FireMouseOverOut fireMouseOverOut)
{
Ref<Frame> protectedFrame(m_frame);
- Element* targetElement = nullptr;
+ RefPtr<Element> targetElement;
// If we're capturing, we always go right to that element.
if (m_capturingMouseEventsElement)
@@ -2596,7 +2589,8 @@
void EventHandler::notifyScrollableAreasOfMouseEvents(const AtomString& eventType, Element* lastElementUnderMouse, Element* elementUnderMouse)
{
- auto* frameView = m_frame.view();
+ Ref protectedFrame = m_frame;
+ RefPtr frameView = m_frame.view();
if (!frameView)
return;
@@ -2673,7 +2667,7 @@
m_mouseDownDelegatedFocus = false;
// If clicking on a frame scrollbar, do not make any change to which element is focused.
- auto* view = m_frame.view();
+ RefPtr view = m_frame.view();
if (view && view->scrollbarAtPoint(platformMouseEvent.position()))
return true;
@@ -2688,7 +2682,7 @@
// Walk up the DOM tree to search for an element to focus.
RefPtr<Element> element;
for (element = m_elementUnderMouse.get(); element; element = element->parentElementInComposedTree()) {
- if (auto* shadowRoot = element->shadowRoot()) {
+ if (RefPtr shadowRoot = element->shadowRoot()) {
if (shadowRoot->delegatesFocus()) {
element = findFirstMouseFocusableElementInComposedTree(*element);
m_mouseDownDelegatedFocus = true;
@@ -2727,7 +2721,7 @@
bool EventHandler::isInsideScrollbar(const IntPoint& windowPoint) const
{
- if (auto* document = m_frame.document()) {
+ if (RefPtr document = m_frame.document()) {
HitTestResult result { windowPoint };
document->hitTest(OptionSet<HitTestRequest::RequestType> { HitTestRequest::ReadOnly, HitTestRequest::DisallowUserAgentShadowContent }, result);
return result.scrollbar();
@@ -2848,6 +2842,7 @@
bool EventHandler::handleWheelEvent(const PlatformWheelEvent& wheelEvent, OptionSet<WheelEventProcessingSteps> processingSteps)
{
+ Ref protectedFrame = m_frame;
#if ENABLE(KINETIC_SCROLLING)
if (wheelEvent.isGestureStart())
m_wheelScrollGestureState = WTF::nullopt;
@@ -2862,14 +2857,13 @@
bool EventHandler::handleWheelEventInternal(const PlatformWheelEvent& event, OptionSet<WheelEventProcessingSteps> processingSteps, OptionSet<EventHandling>& handling)
{
- auto* document = m_frame.document();
+ RefPtr document = m_frame.document();
if (!document)
return false;
Ref<Frame> protectedFrame(m_frame);
- RefPtr<FrameView> protector(m_frame.view());
- FrameView* view = m_frame.view();
+ RefPtr view = m_frame.view();
if (!view)
return false;
@@ -3128,8 +3122,8 @@
{
Ref<Frame> protectedFrame(m_frame);
- Document* doc = m_frame.document();
- FrameView* view = m_frame.view();
+ RefPtr doc = m_frame.document();
+ RefPtr view = m_frame.view();
if (!view)
return false;
@@ -3166,11 +3160,11 @@
{
Ref<Frame> protectedFrame(m_frame);
- FrameView* view = m_frame.view();
+ RefPtr view = m_frame.view();
if (!view)
return false;
- Document* doc = m_frame.document();
+ RefPtr doc = m_frame.document();
if (!doc)
return false;
@@ -3186,7 +3180,7 @@
#endif
IntPoint location;
- Element* focusedElement = doc->focusedElement();
+ RefPtr focusedElement = doc->focusedElement();
const VisibleSelection& selection = m_frame.selection().selection();
Position start = selection.start();
@@ -3215,13 +3209,13 @@
IntPoint position = view->contentsToRootView(location);
IntPoint globalPosition = view->hostWindow()->rootViewToScreen(IntRect(position, IntSize())).location();
- Node* targetNode = doc->focusedElement();
+ RefPtr<Node> targetNode = doc->focusedElement();
if (!targetNode)
targetNode = doc;
// Use the focused node as the target for hover and active.
HitTestResult result(position);
- result.setInnerNode(targetNode);
+ result.setInnerNode(targetNode.get());
doc->updateHoverActiveState(OptionSet<HitTestRequest::RequestType> { HitTestRequest::Active, HitTestRequest::DisallowUserAgentShadowContent }, result.targetElement());
// The contextmenu event is a mouse event even when invoked using the keyboard.
@@ -3311,8 +3305,8 @@
{
ASSERT(!m_mousePressed);
- FrameView* view = m_frame.view();
- if (!view)
+ Ref protectedFrame = m_frame;
+ if (!m_frame.view())
return;
if (!m_frame.page() || !m_frame.page()->isVisible() || !m_frame.page()->focusController().isActive())
@@ -3347,8 +3341,8 @@
Ref<Frame> protectedFrame(m_frame);
- if (auto* document = m_frame.document()) {
- if (FrameView* view = m_frame.view()) {
+ if (RefPtr document = m_frame.document()) {
+ if (RefPtr view = m_frame.view()) {
HitTestResult result(view->windowToContents(m_lastKnownMousePosition));
constexpr OptionSet<HitTestRequest::RequestType> hitType { HitTestRequest::Move, HitTestRequest::DisallowUserAgentShadowContent };
document->hitTest(hitType, result);
@@ -3372,6 +3366,7 @@
bool EventHandler::handleAccessKey(const PlatformKeyboardEvent& event)
{
+ Ref protectedFrame = m_frame;
// FIXME: Ignoring the state of Shift key is what neither IE nor Firefox do.
// IE matches lower and upper case access keys regardless of Shift key state - but if both upper and
// lower case variants are present in a document, the correct element is matched based on Shift key state.
@@ -3397,7 +3392,7 @@
#if ENABLE(FULLSCREEN_API)
bool EventHandler::isKeyEventAllowedInFullScreen(const PlatformKeyboardEvent& keyEvent) const
{
- Document* document = m_frame.document();
+ RefPtr document = m_frame.document();
if (document->fullscreenManager().isFullscreenKeyboardInputAllowed())
return true;
@@ -3418,7 +3413,8 @@
bool EventHandler::keyEvent(const PlatformKeyboardEvent& keyEvent)
{
- Document* topDocument = m_frame.document() ? &m_frame.document()->topDocument() : nullptr;
+ Ref protectedFrame = m_frame;
+ RefPtr topDocument = m_frame.document() ? &m_frame.document()->topDocument() : nullptr;
MonotonicTime savedLastHandledUserGestureTimestamp;
bool savedUserDidInteractWithPage = topDocument ? topDocument->userDidInteractWithPage() : false;
@@ -3485,7 +3481,7 @@
capsLockStateMayHaveChanged();
#if ENABLE(PAN_SCROLLING)
- if (m_frame.mainFrame().eventHandler().panScrollInProgress()) {
+ if (Ref(m_frame.mainFrame())->eventHandler().panScrollInProgress()) {
// If a key is pressed while the panScroll is in progress then we want to stop
if (initialKeyEvent.type() == PlatformEvent::KeyDown || initialKeyEvent.type() == PlatformEvent::RawKeyDown)
stopAutoscrollTimer();
@@ -3623,7 +3619,7 @@
static void setInitialKeyboardSelection(Frame& frame, SelectionDirection direction)
{
- Document* document = frame.document();
+ RefPtr document = frame.document();
if (!document)
return;
@@ -3632,7 +3628,7 @@
if (!selection.isNone())
return;
- Element* focusedElement = document->focusedElement();
+ RefPtr focusedElement = document->focusedElement();
VisiblePosition visiblePosition;
switch (direction) {
@@ -3639,16 +3635,16 @@
case SelectionDirection::Backward:
case SelectionDirection::Left:
if (focusedElement)
- visiblePosition = VisiblePosition(positionBeforeNode(focusedElement));
+ visiblePosition = VisiblePosition(positionBeforeNode(focusedElement.get()));
else
- visiblePosition = endOfDocument(document);
+ visiblePosition = endOfDocument(document.get());
break;
case SelectionDirection::Forward:
case SelectionDirection::Right:
if (focusedElement)
- visiblePosition = VisiblePosition(positionAfterNode(focusedElement));
+ visiblePosition = VisiblePosition(positionAfterNode(focusedElement.get()));
else
- visiblePosition = startOfDocument(document);
+ visiblePosition = startOfDocument(document.get());
break;
}
@@ -3808,8 +3804,8 @@
static void removeDraggedContentDocumentMarkersFromAllFramesInPage(Page& page)
{
- for (Frame* frame = &page.mainFrame(); frame; frame = frame->tree().traverseNext()) {
- if (auto* document = frame->document())
+ for (RefPtr frame = &page.mainFrame(); frame; frame = frame->tree().traverseNext()) {
+ if (RefPtr document = frame->document())
document->markers().removeMarkers(DocumentMarker::DraggedContent);
}
@@ -4183,7 +4179,6 @@
event.setDefaultHandled();
}
-
void EventHandler::defaultArrowEventHandler(FocusDirection focusDirection, KeyboardEvent& event)
{
ASSERT(event.type() == eventNames().keydownEvent);
@@ -4390,15 +4385,16 @@
if (freshTouchEvents) {
result = hitTestResultAtPoint(pagePoint, hitType | HitTestRequest::AllowChildFrameContent);
m_originatingTouchPointTargetKey = touchPointTargetKey;
- } else if (m_originatingTouchPointDocument.get() && m_originatingTouchPointDocument->frame()) {
- LayoutPoint pagePointInOriginatingDocument = documentPointForWindowPoint(*m_originatingTouchPointDocument->frame(), point.pos());
- result = hitTestResultInFrame(m_originatingTouchPointDocument->frame(), pagePointInOriginatingDocument, hitType);
+ } else if (m_originatingTouchPointDocument && m_originatingTouchPointDocument->frame()) {
+ Ref frame = *m_originatingTouchPointDocument->frame();
+ LayoutPoint pagePointInOriginatingDocument = documentPointForWindowPoint(frame, point.pos());
+ result = hitTestResultInFrame(frame.ptr(), pagePointInOriginatingDocument, hitType);
if (!result.innerNode())
continue;
} else
continue;
- Element* element = result.targetElement();
+ RefPtr element = result.targetElement();
ASSERT(element);
if (element && InspectorInstrumentation::handleTouchEvent(m_frame, *element))
@@ -4433,7 +4429,7 @@
auto& document = downcast<Node>(*touchTarget).document();
if (!document.hasTouchEventHandlers())
continue;
- auto* targetFrame = document.frame();
+ RefPtr targetFrame = document.frame();
if (!targetFrame)
continue;
@@ -4447,7 +4443,7 @@
int adjustedPageX = lroundf(pagePoint.x() / scaleFactor);
int adjustedPageY = lroundf(pagePoint.y() / scaleFactor);
- auto touch = Touch::create(targetFrame, touchTarget.get(), point.id(),
+ auto touch = Touch::create(targetFrame.get(), touchTarget.get(), point.id(),
point.screenPos().x(), point.screenPos().y(), adjustedPageX, adjustedPageY,
point.radiusX(), point.radiusY(), point.rotationAngle(), point.force());
@@ -4574,7 +4570,7 @@
if (!is<FrameView>(widget))
return false;
- return downcast<FrameView>(widget).frame().eventHandler().handleWheelEvent(event, processingSteps);
+ return Ref(downcast<FrameView>(widget).frame())->eventHandler().handleWheelEvent(event, processingSteps);
}
bool EventHandler::tabsToAllFormControls(KeyboardEvent*) const
