| Index: third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp
|
| index e5c53023e278cb7e184deca631af9ea78433224e..e66ef9d730c91e5fc6ac9d5eb359fd4651c48ab5 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp
|
| @@ -51,6 +51,7 @@
|
| #include "core/html/canvas/CanvasRenderingContext.h"
|
| #include "core/html/canvas/CanvasRenderingContextFactory.h"
|
| #include "core/imagebitmap/ImageBitmapOptions.h"
|
| +#include "core/layout/HitTestCanvasResult.h"
|
| #include "core/layout/LayoutHTMLCanvas.h"
|
| #include "core/paint/PaintLayer.h"
|
| #include "core/paint/PaintTiming.h"
|
| @@ -1212,11 +1213,11 @@ bool HTMLCanvasElement::isSupportedInteractiveCanvasFallback(const Element& elem
|
| return false;
|
| }
|
|
|
| -std::pair<Element*, String> HTMLCanvasElement::getControlAndIdIfHitRegionExists(const LayoutPoint& location)
|
| +HitTestCanvasResult* HTMLCanvasElement::getControlAndIdIfHitRegionExists(const LayoutPoint& location)
|
| {
|
| if (m_context && m_context->is2d())
|
| return m_context->getControlAndIdIfHitRegionExists(location);
|
| - return std::make_pair(nullptr, String());
|
| + return HitTestCanvasResult::create(String(), nullptr);
|
| }
|
|
|
| String HTMLCanvasElement::getIdFromControl(const Element* element)
|
|
|