Bug 820506 - Problem selecting image node in SVG when used with clip-path in certain condition. r=roc, a=bbajaj.
authorJonathan Watt <jwatt@jwatt.org>
Thu, 10 Jan 2013 00:09:19 +0000
changeset 127047 7704435ed3f6fd76624423b8794767608c0705cf
parent 127046 060a35932d71fb0db23172f3d8594cd1b6305b05
child 127048 62b19c4e86969ca53df0b4ad4cd4add1e8ad43da
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc, bbajaj
bugs820506
milestone20.0a2
Bug 820506 - Problem selecting image node in SVG when used with clip-path in certain condition. r=roc, a=bbajaj.
content/svg/content/test/Makefile.in
content/svg/content/test/test_pointer-events-4.xhtml
layout/svg/nsSVGIntegrationUtils.cpp
--- a/content/svg/content/test/Makefile.in
+++ b/content/svg/content/test/Makefile.in
@@ -46,16 +46,17 @@ MOCHITEST_FILES = \
 		$(filter disabled-for-intermittent-failures--bug-701060, test_lang.xhtml) \
 		test_nonAnimStrings.xhtml \
 		test_pathAnimInterpolation.xhtml \
 		test_pathSeg.xhtml \
 		test_pointAtLength.xhtml \
 		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 \
 		animated-svg-image-helper.html \
 		animated-svg-image-helper.svg \
 		test_stroke-linecap-hit-testing.xhtml \
 		test_SVG_namespace_ids.html \
 		test_SVGLengthList.xhtml \
new file mode 100644
--- /dev/null
+++ b/content/svg/content/test/test_pointer-events-4.xhtml
@@ -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>
--- a/layout/svg/nsSVGIntegrationUtils.cpp
+++ b/layout/svg/nsSVGIntegrationUtils.cpp
@@ -351,18 +351,23 @@ nsSVGIntegrationUtils::GetRequiredSource
 }
 
 bool
 nsSVGIntegrationUtils::HitTestFrameForEffects(nsIFrame* aFrame, const nsPoint& aPt)
 {
   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);
 }
 
 class RegularFramePaintCallback : public nsSVGFilterPaintCallback
 {
 public:
   RegularFramePaintCallback(nsDisplayListBuilder* aBuilder,