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

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
@@ skipping 28 matching lines @@
 #include "core/CSSPropertyNames.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/AXObjectCache.h"
 #include "core/dom/StyleEngine.h"
 #include "core/events/Event.h"
 #include "core/events/MouseEvent.h"
 #include "core/frame/Settings.h"
 #include "core/html/TextMetrics.h"
 #include "core/html/canvas/CanvasFontCache.h"
+#include "core/layout/HitTestCanvasResult.h"
 #include "core/layout/LayoutBox.h"
 #include "core/layout/LayoutTheme.h"
 #include "modules/canvas2d/CanvasStyle.h"
 #include "modules/canvas2d/HitRegion.h"
 #include "modules/canvas2d/Path2D.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/graphics/DrawLooperBuilder.h"
 #include "platform/graphics/ExpensiveCanvasHeuristicParameters.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/StrokeData.h"
@@ skipping 523 matching lines @@
 ImageBuffer* CanvasRenderingContext2D::imageBuffer() const
 {
     return canvas()->buffer();
 }
 
 bool CanvasRenderingContext2D::parseColorOrCurrentColor(Color& color, const String& colorString) const
 {
     return ::blink::parseColorOrCurrentColor(color, colorString, canvas());
 }
 
-std::pair<Element*, String> CanvasRenderingContext2D::getControlAndIdIfHitRegionExists(const LayoutPoint& location)
+HitTestCanvasResult* CanvasRenderingContext2D::getControlAndIdIfHitRegionExists(const LayoutPoint& location)
 {
     if (hitRegionsCount() <= 0)
-        return std::make_pair(nullptr, String());
+        return HitTestCanvasResult::create(String(), nullptr);
 
     LayoutBox* box = canvas()->layoutBox();
     FloatPoint localPos = box->absoluteToLocal(FloatPoint(location), UseTransforms);
     if (box->hasBorderOrPadding())
         localPos.move(-box->contentBoxOffset());
     localPos.scale(canvas()->width() / box->contentWidth(), canvas()->height() / box->contentHeight());
 
     HitRegion* hitRegion = hitRegionAtPoint(localPos);
     if (hitRegion) {
         Element* control = hitRegion->control();
         if (control && canvas()->isSupportedInteractiveCanvasFallback(*control))
-            return std::make_pair(hitRegion->control(), hitRegion->id());
-        return std::make_pair(nullptr, hitRegion->id());
+            return HitTestCanvasResult::create(hitRegion->id(), hitRegion->control());
+        return HitTestCanvasResult::create(hitRegion->id(), nullptr);
     }
-    return std::make_pair(nullptr, String());
+    return HitTestCanvasResult::create(String(), nullptr);
 }
 
 String CanvasRenderingContext2D::getIdFromControl(const Element* element)
 {
     if (hitRegionsCount() <= 0)
         return String();
 
     if (HitRegion* hitRegion = m_hitRegionManager->getHitRegionByControl(element))
         return hitRegion->id();
     return String();
@@ skipping 468 matching lines @@
     return true;
 }
 
 void CanvasRenderingContext2D::resetUsageTracking()
 {
     UsageCounters newCounters;
     m_usageCounters = newCounters;
 }
 
 } // namespace blink