Index: third_party/WebKit/Source/core/input/EventHandler.cpp |
diff --git a/third_party/WebKit/Source/core/input/EventHandler.cpp b/third_party/WebKit/Source/core/input/EventHandler.cpp |
index 9a25c2fe9e6fd714872059c463c62dbec30b83fd..1d616440e66dcdd28901ddcf6cc145b2df34ff2a 100644 |
--- a/third_party/WebKit/Source/core/input/EventHandler.cpp |
+++ b/third_party/WebKit/Source/core/input/EventHandler.cpp |
@@ -1182,23 +1182,57 @@ Node* EventHandler::updateMouseEventTargetNode(Node* targetNode) { |
return newNodeUnderMouse; |
} |
+bool EventHandler::isTouchPointerEventActiveOnFrame(int pointerId, |
+ LocalFrame* frame) { |
+ DCHECK_EQ(m_frame, m_frame->localFrameRoot()); |
+ return m_pointerEventManager->isTouchPointerEventActiveOnFrame(pointerId, |
+ frame); |
+} |
+ |
bool EventHandler::isPointerEventActive(int pointerId) { |
- return m_pointerEventManager->isActive(pointerId); |
+ return m_pointerEventManager->isActive(pointerId) || |
+ m_frame->localFrameRoot() |
+ ->eventHandler() |
+ .isTouchPointerEventActiveOnFrame(pointerId, m_frame); |
} |
void EventHandler::setPointerCapture(int pointerId, EventTarget* target) { |
// TODO(crbug.com/591387): This functionality should be per page not per |
// frame. |
- m_pointerEventManager->setPointerCapture(pointerId, target); |
+ if (m_frame != m_frame->localFrameRoot() && |
mustaq
2016/10/13 16:38:25
The same check is repeated 3 times---this calls fo
Navid Zolghadr
2016/10/13 17:32:32
Done.
mustaq
2016/10/13 19:55:38
I think IsPointerActiveInRootFrame is a bit misnom
Navid Zolghadr
2016/10/14 14:50:28
I updated the name.
The second paragraph is not ap
|
+ m_frame->localFrameRoot() |
+ ->eventHandler() |
+ .isTouchPointerEventActiveOnFrame(pointerId, m_frame)) { |
+ m_frame->localFrameRoot()->eventHandler().setPointerCapture(pointerId, |
+ target); |
+ } else { |
+ m_pointerEventManager->setPointerCapture(pointerId, target); |
mustaq
2016/10/13 16:38:25
Not clear why we shouldn't check |isActiveOnFrame|
Navid Zolghadr
2016/10/13 17:32:32
setPointerCapture just ignores if the pointer is n
mustaq
2016/10/13 19:55:38
Does that mean there is a possibility setPointerCa
Navid Zolghadr
2016/10/14 14:50:28
If that lastNodeReceivingEvent is null that means
|
+ } |
} |
void EventHandler::releasePointerCapture(int pointerId, EventTarget* target) { |
- m_pointerEventManager->releasePointerCapture(pointerId, target); |
+ if (m_frame != m_frame->localFrameRoot() && |
+ m_frame->localFrameRoot() |
+ ->eventHandler() |
+ .isTouchPointerEventActiveOnFrame(pointerId, m_frame)) { |
+ m_frame->localFrameRoot()->eventHandler().releasePointerCapture(pointerId, |
+ target); |
+ } else { |
+ m_pointerEventManager->releasePointerCapture(pointerId, target); |
+ } |
} |
bool EventHandler::hasPointerCapture(int pointerId, |
const EventTarget* target) const { |
- return m_pointerEventManager->hasPointerCapture(pointerId, target); |
+ if (m_frame != m_frame->localFrameRoot() && |
+ m_frame->localFrameRoot() |
+ ->eventHandler() |
+ .isTouchPointerEventActiveOnFrame(pointerId, m_frame)) { |
+ return m_frame->localFrameRoot()->eventHandler().hasPointerCapture( |
+ pointerId, target); |
+ } else { |
+ return m_pointerEventManager->hasPointerCapture(pointerId, target); |
+ } |
} |
bool EventHandler::hasProcessedPointerCapture(int pointerId, |