| 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..d246299e48e9096ba4eb975b64af8d16a7fb6f65 100644
|
| --- a/third_party/WebKit/Source/core/input/EventHandler.cpp
|
| +++ b/third_party/WebKit/Source/core/input/EventHandler.cpp
|
| @@ -1182,23 +1182,53 @@ Node* EventHandler::updateMouseEventTargetNode(Node* targetNode) {
|
| return newNodeUnderMouse;
|
| }
|
|
|
| +bool EventHandler::isTouchPointerIdActiveOnFrame(int pointerId,
|
| + LocalFrame* frame) const {
|
| + DCHECK_EQ(m_frame, m_frame->localFrameRoot());
|
| + return m_pointerEventManager->isTouchPointerIdActiveOnFrame(pointerId, frame);
|
| +}
|
| +
|
| +bool EventHandler::RootFrameTouchPointerActiveInCurrentFrame(
|
| + int pointerId) const {
|
| + return m_frame != m_frame->localFrameRoot() &&
|
| + m_frame->localFrameRoot()
|
| + ->eventHandler()
|
| + .isTouchPointerIdActiveOnFrame(pointerId, m_frame);
|
| +}
|
| +
|
| bool EventHandler::isPointerEventActive(int pointerId) {
|
| - return m_pointerEventManager->isActive(pointerId);
|
| + return m_pointerEventManager->isActive(pointerId) ||
|
| + RootFrameTouchPointerActiveInCurrentFrame(pointerId);
|
| }
|
|
|
| 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 (RootFrameTouchPointerActiveInCurrentFrame(pointerId)) {
|
| + m_frame->localFrameRoot()->eventHandler().setPointerCapture(pointerId,
|
| + target);
|
| + } else {
|
| + m_pointerEventManager->setPointerCapture(pointerId, target);
|
| + }
|
| }
|
|
|
| void EventHandler::releasePointerCapture(int pointerId, EventTarget* target) {
|
| - m_pointerEventManager->releasePointerCapture(pointerId, target);
|
| + if (RootFrameTouchPointerActiveInCurrentFrame(pointerId)) {
|
| + 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 (RootFrameTouchPointerActiveInCurrentFrame(pointerId)) {
|
| + return m_frame->localFrameRoot()->eventHandler().hasPointerCapture(
|
| + pointerId, target);
|
| + } else {
|
| + return m_pointerEventManager->hasPointerCapture(pointerId, target);
|
| + }
|
| }
|
|
|
| bool EventHandler::hasProcessedPointerCapture(int pointerId,
|
|
|