Check the root frame pointer events as well for capture

third_party/WebKit/Source/core/input/EventHandler.cpp

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..5f84280da3e25d335bd45d47d474508880c6f12e 100644
--- a/third_party/WebKit/Source/core/input/EventHandler.cpp
+++ b/third_party/WebKit/Source/core/input/EventHandler.cpp
@@ -1182,23 +1182,52 @@ Node* EventHandler::updateMouseEventTargetNode(Node* targetNode) {
   return newNodeUnderMouse;
 }
 
+bool EventHandler::isPointerEventActiveOnFrame(int pointerId,

[mustaq, 2016/10/13 19:55:38]

Nit: s/Event/Id/ in these predicates.

[Navid Zolghadr, 2016/10/14 14:50:28]

Done.

+                                               LocalFrame* frame) const {
+  DCHECK_EQ(m_frame, m_frame->localFrameRoot());
+  return m_pointerEventManager->isPointerEventActiveOnFrame(pointerId, frame);
+}
+
+bool EventHandler::IsPointerActiveInRootFrame(int pointerId) const {
+  return m_frame != m_frame->localFrameRoot() &&
+         m_frame->localFrameRoot()->eventHandler().isPointerEventActiveOnFrame(
+             pointerId, m_frame);
+}
+
 bool EventHandler::isPointerEventActive(int pointerId) {
-  return m_pointerEventManager->isActive(pointerId);
+  return m_pointerEventManager->isActive(pointerId) ||
+         m_frame->localFrameRoot()->eventHandler().isPointerEventActiveOnFrame(
+             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 (IsPointerActiveInRootFrame(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 (IsPointerActiveInRootFrame(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 (IsPointerActiveInRootFrame(pointerId)) {
+    return m_frame->localFrameRoot()->eventHandler().hasPointerCapture(
+        pointerId, target);
+  } else {
+    return m_pointerEventManager->hasPointerCapture(pointerId, target);
+  }
 }
 
 bool EventHandler::hasProcessedPointerCapture(int pointerId,