third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp - Issue 2229743003: add HitTestCanvasResult Class instend of std::pair<Element*, String>

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

Issue 2229743003: add HitTestCanvasResult Class instend of std::pair<Element*, String> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add HitTestCanvasResult Class instend of std::pair<Element*, String> Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLCanvasElement.h ('k') | third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 0e451a551665448efc2cd2f1f11dc329eed9a052..f27f0a5583916a153b6701182a01964f3c846e08 100644

--- a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

@@ -52,6 +52,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"

@@ -1220,11 +1221,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)