Commit 35cfe759 authored by sigbjornf's avatar sigbjornf Committed by Commit bot

Fix non-Oilpan PassRefPtr<> usage following r375261.

Add required RefPtr<> local bindings of incoming PassRefPtr<>s.

R=haraken
BUG=583376

Review URL: https://codereview.chromium.org/1703113003

Cr-Commit-Position: refs/heads/master@{#376122}
parent 9ac8d605
...@@ -58,27 +58,31 @@ bool isInDocument(PassRefPtrWillBeRawPtr<EventTarget> n) ...@@ -58,27 +58,31 @@ bool isInDocument(PassRefPtrWillBeRawPtr<EventTarget> n)
} }
WebInputEventResult dispatchPointerEvent( WebInputEventResult dispatchPointerEvent(
PassRefPtrWillBeRawPtr<EventTarget> target, PassRefPtrWillBeRawPtr<EventTarget> prpTarget,
PassRefPtrWillBeRawPtr<PointerEvent> pointerevent, PassRefPtrWillBeRawPtr<PointerEvent> prpPointerEvent,
bool checkForListener = false) bool checkForListener = false)
{ {
RefPtrWillBeRawPtr<EventTarget> target = prpTarget;
RefPtrWillBeRawPtr<PointerEvent> pointerEvent = prpPointerEvent;
if (!RuntimeEnabledFeatures::pointerEventEnabled()) if (!RuntimeEnabledFeatures::pointerEventEnabled())
return WebInputEventResult::NotHandled; return WebInputEventResult::NotHandled;
if (!checkForListener || target->hasEventListeners(pointerevent->type())) { if (!checkForListener || target->hasEventListeners(pointerEvent->type())) {
bool dispatchResult = target->dispatchEvent(pointerevent); bool dispatchResult = target->dispatchEvent(pointerEvent);
return EventHandler::eventToEventResult(pointerevent, dispatchResult); return EventHandler::eventToEventResult(pointerEvent, dispatchResult);
} }
return WebInputEventResult::NotHandled; return WebInputEventResult::NotHandled;
} }
WebInputEventResult dispatchMouseEvent( WebInputEventResult dispatchMouseEvent(
PassRefPtrWillBeRawPtr<EventTarget> target, PassRefPtrWillBeRawPtr<EventTarget> prpTarget,
const AtomicString& mouseEventType, const AtomicString& mouseEventType,
const PlatformMouseEvent& mouseEvent, const PlatformMouseEvent& mouseEvent,
PassRefPtrWillBeRawPtr<EventTarget> relatedTarget, PassRefPtrWillBeRawPtr<EventTarget> prpRelatedTarget,
int detail = 0, int detail = 0,
bool checkForListener = false) bool checkForListener = false)
{ {
RefPtrWillBeRawPtr<EventTarget> target = prpTarget;
RefPtrWillBeRawPtr<EventTarget> relatedTarget = prpRelatedTarget;
if (target->toNode() if (target->toNode()
&& (!checkForListener || target->hasEventListeners(mouseEventType))) { && (!checkForListener || target->hasEventListeners(mouseEventType))) {
RefPtrWillBeRawPtr<Node> targetNode = target->toNode(); RefPtrWillBeRawPtr<Node> targetNode = target->toNode();
...@@ -116,11 +120,14 @@ void PointerEventManager::sendNodeTransitionEvents( ...@@ -116,11 +120,14 @@ void PointerEventManager::sendNodeTransitionEvents(
} }
void PointerEventManager::sendNodeTransitionEvents( void PointerEventManager::sendNodeTransitionEvents(
PassRefPtrWillBeRawPtr<EventTarget> exitedTarget, PassRefPtrWillBeRawPtr<EventTarget> prpExitedTarget,
PassRefPtrWillBeRawPtr<EventTarget> enteredTarget, PassRefPtrWillBeRawPtr<EventTarget> prpEnteredTarget,
PassRefPtrWillBeRawPtr<PointerEvent> pointerEvent, PassRefPtrWillBeRawPtr<PointerEvent> prpPointerEvent,
const PlatformMouseEvent& mouseEvent, bool sendMouseEvent) const PlatformMouseEvent& mouseEvent, bool sendMouseEvent)
{ {
RefPtrWillBeRawPtr<EventTarget> exitedTarget = prpExitedTarget;
RefPtrWillBeRawPtr<EventTarget> enteredTarget = prpEnteredTarget;
RefPtrWillBeRawPtr<PointerEvent> pointerEvent = prpPointerEvent;
if (exitedTarget == enteredTarget) if (exitedTarget == enteredTarget)
return; return;
...@@ -238,19 +245,21 @@ void PointerEventManager::sendNodeTransitionEvents( ...@@ -238,19 +245,21 @@ void PointerEventManager::sendNodeTransitionEvents(
} }
void PointerEventManager::setNodeUnderPointer( void PointerEventManager::setNodeUnderPointer(
PassRefPtrWillBeRawPtr<PointerEvent> pointerevent, PassRefPtrWillBeRawPtr<PointerEvent> prpPointerEvent,
PassRefPtrWillBeRawPtr<EventTarget> target) PassRefPtrWillBeRawPtr<EventTarget> prpTarget)
{ {
if (m_nodeUnderPointer.contains(pointerevent->pointerId())) { RefPtrWillBeRawPtr<PointerEvent> pointerEvent = prpPointerEvent;
RefPtrWillBeRawPtr<EventTarget> target = prpTarget;
if (m_nodeUnderPointer.contains(pointerEvent->pointerId())) {
sendNodeTransitionEvents(m_nodeUnderPointer.get( sendNodeTransitionEvents(m_nodeUnderPointer.get(
pointerevent->pointerId()), target, pointerevent); pointerEvent->pointerId()), target, pointerEvent);
if (!target) if (!target)
m_nodeUnderPointer.remove(pointerevent->pointerId()); m_nodeUnderPointer.remove(pointerEvent->pointerId());
else else
m_nodeUnderPointer.set(pointerevent->pointerId(), target); m_nodeUnderPointer.set(pointerEvent->pointerId(), target);
} else if (target) { } else if (target) {
sendNodeTransitionEvents(nullptr, target, pointerevent); sendNodeTransitionEvents(nullptr, target, pointerEvent);
m_nodeUnderPointer.add(pointerevent->pointerId(), target); m_nodeUnderPointer.add(pointerEvent->pointerId(), target);
} }
} }
...@@ -268,11 +277,12 @@ void PointerEventManager::sendTouchCancelPointerEvent(PassRefPtrWillBeRawPtr<Eve ...@@ -268,11 +277,12 @@ void PointerEventManager::sendTouchCancelPointerEvent(PassRefPtrWillBeRawPtr<Eve
} }
WebInputEventResult PointerEventManager::sendTouchPointerEvent( WebInputEventResult PointerEventManager::sendTouchPointerEvent(
PassRefPtrWillBeRawPtr<EventTarget> target, PassRefPtrWillBeRawPtr<EventTarget> prpTarget,
const PlatformTouchPoint& touchPoint, PlatformEvent::Modifiers modifiers, const PlatformTouchPoint& touchPoint, PlatformEvent::Modifiers modifiers,
const double width, const double height, const double width, const double height,
const double clientX, const double clientY) const double clientX, const double clientY)
{ {
RefPtrWillBeRawPtr<EventTarget> target = prpTarget;
RefPtrWillBeRawPtr<PointerEvent> pointerEvent = RefPtrWillBeRawPtr<PointerEvent> pointerEvent =
m_pointerEventFactory.create( m_pointerEventFactory.create(
pointerEventNameForTouchPointState(touchPoint.state()), pointerEventNameForTouchPointState(touchPoint.state()),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment