third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp - Issue 1630683002: Canvas2d: addHitRegion() should take clipping region into account.

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/modules/canvas2d/CanvasRenderingContext2D.cpp

Issue 1630683002: Canvas2d: addHitRegion() should take clipping region into account. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressed comments Created 4 years, 11 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/LayoutTests/fast/canvas/canvas-hit-regions-clip-test.html ('k') | third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

index a7155d9eea21952d09be79e81fd6ccc9a465ae25..a16a6576496514d0b6c3a5dd869740d6efeff246 100644

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

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

@@ -2218,11 +2218,9 @@ void CanvasRenderingContext2D::addHitRegion(const HitRegionOptions& options, Exc

hitRegionPath.transform(state().transform());

if (state().hasClip()) {

- // FIXME: The hit regions should take clipping region into account.

- // However, we have no way to get the region from canvas state stack by now.

- // See http://crbug.com/387057

- exceptionState.throwDOMException(NotSupportedError, "The specified path has no pixels.");

- return;

+ hitRegionPath = state().intersectPathWithClip(hitRegionPath.skPath());

+ if (hitRegionPath.isEmpty())

+ exceptionState.throwDOMException(NotSupportedError, "The specified path has no pixels.");

}

if (!m_hitRegionManager)