Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 820506 - Problem selecting image node in SVG when used with clip-path in certain condition. r=roc.

Browse Source 
--HG--
extra : rebase_source : 874ed2a13f51dc5381909502f030cb4ca6c2a41e
This commit is contained in:
Jonathan Watt 2013-01-04 11:48:12 +00:00
parent 37b948817c
commit bc8a83065f
3 changed files with 118 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
content/svg/content/test/Makefile.in
View File

@ -51,6 +51,7 @@ MOCHITEST_FILES = \
test_pointer-events.xhtml \
test_pointer-events-2.xhtml \
test_pointer-events-3.xhtml \
test_pointer-events-4.xhtml \
test_scientific.html \
scientific-helper.svg \
test_SVGAnimatedImageSMILDisabled.html \

110
content/svg/content/test/test_pointer-events-4.xhtml Normal file
View File

@ -0,0 +1,110 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=820506
-->
<head>
<title>Test pointer events with clipPath</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body onload="run()">
<script class="testbody" type="text/javascript">
<![CDATA[
SimpleTest.waitForExplicitFinish();
function run()
{
var svgDoc = document.getElementById('svg');
var div = document.getElementById("div");
// Get the coords of the origin of the SVG canvas:
var originX = div.offsetLeft;
var originY = div.offsetTop;
var r1 = document.getElementById('r1');
var r2 = document.getElementById('r2');
var element;
// Test r1 just outsite the clip area:
element = document.elementFromPoint(originX + 19, originY + 19);
is(element, background, 'Should not hit top-left of r1');
element = document.elementFromPoint(originX + 101, originY + 19);
is(element, background, 'Should not hit top-right of r1');
element = document.elementFromPoint(originX + 101, originY + 101);
is(element, background, 'Should not hit bottom-right of r1');
element = document.elementFromPoint(originX + 19, originY + 101);
is(element, background, 'Should not hit bottom-left of r1');
// Test r1 just inside the clip area:
element = document.elementFromPoint(originX + 21, originY + 21);
is(element, r1, 'Should hit top-left of r1');
element = document.elementFromPoint(originX + 99, originY + 21);
is(element, r1, 'Should hit top-right of r1');
element = document.elementFromPoint(originX + 99, originY + 99);
is(element, r1, 'Should hit bottom-right of r1');
element = document.elementFromPoint(originX + 21, originY + 99);
is(element, r1, 'Should hit bottom-left of r1');
// Test r2 just outsite the clip area:
element = document.elementFromPoint(originX + 109, originY + 19);
is(element, background, 'Should not hit top-left of r2');
element = document.elementFromPoint(originX + 201, originY + 19);
is(element, background, 'Should not hit top-right of r2');
element = document.elementFromPoint(originX + 201, originY + 101);
is(element, background, 'Should not hit bottom-right of r2');
element = document.elementFromPoint(originX + 109, originY + 101);
is(element, background, 'Should not hit bottom-left of r2');
// Test r2 just inside the clip area:
element = document.elementFromPoint(originX + 121, originY + 21);
is(element, r2, 'Should hit top-left of r2');
element = document.elementFromPoint(originX + 199, originY + 21);
is(element, r2, 'Should hit top-right of r2');
element = document.elementFromPoint(originX + 199, originY + 99);
is(element, r2, 'Should hit bottom-right of r2');
element = document.elementFromPoint(originX + 121, originY + 99);
is(element, r2, 'Should hit bottom-left of r2');
SimpleTest.finish();
}
]]>
</script>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=500174">Mozilla Bug 500174</a>
<p id="display"></p>
<div id="content">
<div width="100%" height="1" id="div">
</div>
<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" id="svg">
<clipPath id="cp1" clipPathUnits="userSpaceOnUse">
<rect x="20" y="20" width="80" height="80"/>
</clipPath>
<clipPath id="cp2" clipPathUnits="objectBoundingBox">
<rect x="0.1" y="0.1" width="0.8" height="0.8"/>
</clipPath>
<rect id="background" width="100%" height="100%" fill="blue"/>
<rect id="r1" x="10" y="10" width="100" height="100" clip-path="url(#cp1)"/>
<rect id="r2" x="110" y="10" width="100" height="100" clip-path="url(#cp2)"/>
</svg>
</div>
<pre id="test">
</pre>
</body>
</html>

9
layout/svg/nsSVGIntegrationUtils.cpp
View File

@ -356,8 +356,13 @@ nsSVGIntegrationUtils::HitTestFrameForEffects(nsIFrame* aFrame, const nsPoint& a
nsIFrame* firstFrame =
nsLayoutUtils::GetFirstContinuationOrSpecialSibling(aFrame);
// Convert aPt to user space:
nsPoint toUserSpace =
aFrame->GetOffsetTo(firstFrame) + GetOffsetToUserSpace(firstFrame);
nsPoint toUserSpace;
if (aFrame->GetStateBits() & NS_FRAME_SVG_LAYOUT) {
toUserSpace = aFrame->GetPosition();
} else {
toUserSpace =
aFrame->GetOffsetTo(firstFrame) + GetOffsetToUserSpace(firstFrame);
}
nsPoint pt = aPt + toUserSpace;
return nsSVGUtils::HitTestClip(firstFrame, pt);
}