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

third_party/WebKit/Source/core/input/TouchEventManager.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/TouchEventManager.h"
 
 #include "core/dom/Document.h"
 #include "core/events/TouchEvent.h"
 #include "core/frame/Deprecation.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.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/Histogram.h"
 #include "platform/PlatformTouchEvent.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 
 namespace blink {
@@ skipping 226 matching lines @@
             // |m_touchSequenceDocument|.
             if (m_touchSequenceDocument && (!touchInfo.touchNode
                 || &touchInfo.touchNode->document() != m_touchSequenceDocument)) {
                 if (m_touchSequenceDocument->frame()) {
                     LayoutPoint framePoint = roundedLayoutPoint(m_touchSequenceDocument->frame()->view()->rootFrameToContents(touchInfo.point.pos()));
                     result = EventHandler::hitTestResultInFrame(m_touchSequenceDocument->frame(), framePoint, hitType);
                     Node* node = result.innerNode();
                     if (!node)
                         continue;
                     if (isHTMLCanvasElement(node)) {
-                        std::pair<Element*, String> regionInfo = toHTMLCanvasElement(node)->getControlAndIdIfHitRegionExists(result.pointInInnerNodeFrame());
-                        if (regionInfo.first)
-                            node = regionInfo.first;
-                        touchInfo.region = regionInfo.second;
+                        HitTestCanvasResult* hitTestCanvasResult = toHTMLCanvasElement(node)->getControlAndIdIfHitRegionExists(result.pointInInnerNodeFrame());
+                        if (hitTestCanvasResult->getControl())
+                            node = hitTestCanvasResult->getControl();
+                        touchInfo.region = hitTestCanvasResult->getId();
                     }
                     // Touch events should not go to text nodes.
                     if (node->isTextNode())
                         node = FlatTreeTraversal::parent(*node);
                     touchInfo.touchNode = node;
                 } else {
                     continue;
                 }
             }
             if (!touchInfo.touchNode)
@@ skipping 257 matching lines @@
         feature = UseCounter::TouchEndDuringScrollUserGestureUtilized;
         break;
     default:
         NOTREACHED();
         return;
     }
     Deprecation::countDeprecation(m_frame, feature);
 }
 
 } // namespace blink