add HitTestCanvasResult Class instend of std::pair<Element*, String>

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/input/PointerEventManager.h"
 
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/shadow/FlatTreeTraversal.h"
 #include "core/events/MouseEvent.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/input/EventHandler.h"
 #include "core/input/TouchActionUtil.h"
+#include "core/layout/HitTestCanvasResult.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "platform/PlatformTouchEvent.h"
 
 namespace blink {
 
 namespace {
 
 size_t toPointerTypeIndex(WebPointerProperties::PointerType t) { return static_cast<size_t>(t); }
 
@@ skipping 392 matching lines @@
         // before firing the event.
         if (touchInfo.point.state() == PlatformTouchPoint::TouchPressed
             || !m_pendingPointerCaptureTarget.contains(pointerId)) {
             HitTestRequest::HitTestRequestType hitType = HitTestRequest::TouchEvent | HitTestRequest::ReadOnly | HitTestRequest::Active;
             LayoutPoint pagePoint = roundedLayoutPoint(m_frame->view()->rootFrameToContents(touchInfo.point.pos()));
             HitTestResult hitTestTesult = m_frame->eventHandler().hitTestResultAtPoint(pagePoint, hitType);
             Node* node = hitTestTesult.innerNode();
             if (node) {
                 touchInfo.targetFrame = node->document().frame();
                 if (isHTMLCanvasElement(node)) {
-                    std::pair<Element*, String> regionInfo = toHTMLCanvasElement(node)->getControlAndIdIfHitRegionExists(hitTestTesult.pointInInnerNodeFrame());
-                    if (regionInfo.first)
-                        node = regionInfo.first;
-                    touchInfo.region = regionInfo.second;
+                    HitTestCanvasResult* hitTestCanvasResult = toHTMLCanvasElement(node)->getControlAndIdIfHitRegionExists(hitTestTesult.pointInInnerNodeFrame());
+                    if (hitTestCanvasResult->getControl())
+                        node = hitTestCanvasResult->getControl();
+                    touchInfo.region = hitTestCanvasResult->getId();
                 }
                 // TODO(crbug.com/612456): We need to investigate whether pointer
                 // events should go to text nodes or not. If so we need to
                 // update the mouse code as well. Also this logic looks similar
                 // to the one in TouchEventManager. We should be able to
                 // refactor it better after this investigation.
                 if (node->isTextNode())
                     node = FlatTreeTraversal::parent(*node);
                 touchInfo.touchNode = node;
 
@@ skipping 363 matching lines @@
 {
     visitor->trace(m_frame);
     visitor->trace(m_nodeUnderPointer);
     visitor->trace(m_pointerCaptureTarget);
     visitor->trace(m_pendingPointerCaptureTarget);
     visitor->trace(m_touchEventManager);
 }
 
 
 } // namespace blink