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

third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef CanvasRenderingContext_h
 #define CanvasRenderingContext_h
 
 #include "core/CoreExport.h"
 #include "core/html/HTMLCanvasElement.h"
+#include "core/layout/HitTestCanvasResult.h"
 #include "core/offscreencanvas/OffscreenCanvas.h"
 #include "wtf/HashSet.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/text/StringHash.h"
 
 class SkCanvas;
 
 namespace blink { class WebLayer; }
 
 namespace blink {
@@ skipping 59 matching lines @@
     // Canvas2D-specific interface
     virtual bool is2d() const { return false; }
     virtual void restoreCanvasMatrixClipStack(SkCanvas*) const { }
     virtual void reset() { }
     virtual void clearRect(double x, double y, double width, double height) { }
     virtual void didSetSurfaceSize() { }
     virtual void setShouldAntialias(bool) { }
     virtual unsigned hitRegionsCount() const { return 0; }
     virtual void setFont(const String&) { }
     virtual void styleDidChange(const ComputedStyle* oldStyle, const ComputedStyle& newStyle) { }
-    virtual std::pair<Element*, String> getControlAndIdIfHitRegionExists(const LayoutPoint& location) { NOTREACHED(); return std::make_pair(nullptr, String()); }
+    virtual HitTestCanvasResult* getControlAndIdIfHitRegionExists(const LayoutPoint& location) { NOTREACHED(); return HitTestCanvasResult::create(String(), nullptr); }
     virtual String getIdFromControl(const Element* element) { return String(); }
     virtual bool isAccelerationOptimalForCanvasContent() const { return true; }
     virtual void resetUsageTracking() { };
     virtual void incrementFrameCount() { };
 
     // WebGL-specific interface
     virtual bool is3d() const { return false; }
     virtual void setFilterQuality(SkFilterQuality) { NOTREACHED(); }
     virtual void reshape(int width, int height) { NOTREACHED(); }
     virtual void markLayerComposited() { NOTREACHED(); }
@@ skipping 22 matching lines @@
 
     Member<HTMLCanvasElement> m_canvas;
     Member<OffscreenCanvas> m_offscreenCanvas;
     HashSet<String> m_cleanURLs;
     HashSet<String> m_dirtyURLs;
 };
 
 } // namespace blink
 
 #endif