Bug 347374 - pointer events not working on unpainted geometry, events

not respecting fill rule or dasharray.  r+sr=roc

layout/svg/base/src/nsSVGGeometryFrame.cpp

@@ -380,10 +380,8 @@ nsSVGGeometryFrame::SetupCairoStrokeGeometry(cairo_t *aCtx)
   }
 }
 
-nsresult
+void
-nsSVGGeometryFrame::SetupCairoStroke(nsISVGRendererCanvas *aCanvas,
+nsSVGGeometryFrame::SetupCairoStrokeHitGeometry(cairo_t *aCtx)
-                                     cairo_t *aCtx,
-                                     void **aClosure)
 {
   SetupCairoStrokeGeometry(aCtx);
 
@@ -394,6 +392,14 @@ nsSVGGeometryFrame::SetupCairoStroke(nsISVGRendererCanvas *aCanvas,
     cairo_set_dash(aCtx, dashArray, count, GetStrokeDashoffset());
     delete [] dashArray;
   }
+}
+
+nsresult
+nsSVGGeometryFrame::SetupCairoStroke(nsISVGRendererCanvas *aCanvas,
+                                     cairo_t *aCtx,
+                                     void **aClosure)
+{
+  SetupCairoStrokeHitGeometry(aCtx);
 
   if (GetStateBits() & NS_STATE_SVG_STROKE_PSERVER) {
     nsSVGPaintServerFrame *ps = NS_STATIC_CAST(nsSVGPaintServerFrame*,

layout/svg/base/src/nsSVGGeometryFrame.h

@@ -96,6 +96,9 @@ public:
   // Set up a cairo context for measuring a stroked path
   void SetupCairoStrokeGeometry(cairo_t *aCtx);
 
+  // Set up a cairo context for hit testing a stroked path
+  void SetupCairoStrokeHitGeometry(cairo_t *aCtx);
+
   // Setup/Cleanup a cairo context for stroking path
   nsresult SetupCairoStroke(nsISVGRendererCanvas *aCanvas,
                             cairo_t *aCtx,

layout/svg/base/src/nsSVGPathGeometryFrame.cpp

@@ -339,17 +339,23 @@ nsSVGPathGeometryFrame::GetFrameForPointSVG(float x, float y, nsIFrame** hit)
   double xx = x, yy = y;
   cairo_device_to_user(ctx, &xx, &yy);
 
-  if (IsClipChild()) {
+  PRUint32 fillRule;
-    if (GetClipRule() == NS_STYLE_FILL_RULE_EVENODD)
+  if (IsClipChild())
-      cairo_set_fill_rule(ctx, CAIRO_FILL_RULE_EVEN_ODD);
+    fillRule = GetClipRule();
-    else
+  else
-      cairo_set_fill_rule(ctx, CAIRO_FILL_RULE_WINDING);
+    fillRule = GetStyleSVG()->mFillRule;
-  }
+
+  if (fillRule == NS_STYLE_FILL_RULE_EVENODD)
+    cairo_set_fill_rule(ctx, CAIRO_FILL_RULE_EVEN_ODD);
+  else
+    cairo_set_fill_rule(ctx, CAIRO_FILL_RULE_WINDING);
 
   if (mask & HITTEST_MASK_FILL)
     isHit = cairo_in_fill(ctx, xx, yy);
-  if (!isHit && (mask & HITTEST_MASK_STROKE))
+  if (!isHit && (mask & HITTEST_MASK_STROKE)) {
+    SetupCairoStrokeHitGeometry(ctx);
     isHit = cairo_in_stroke(ctx, xx, yy);
+  }
 
   cairo_destroy(ctx);
 
@@ -417,31 +423,23 @@ nsSVGPathGeometryFrame::UpdateCoveredRegion()
 {
   mRect.Empty();
 
-  PRBool hasFill = HasFill();
+  cairo_t *ctx = cairo_create(nsSVGUtils::GetCairoComputationalSurface());
-  PRBool hasStroke = HasStroke();
 
-  if (hasFill || hasStroke) {
+  GeneratePath(ctx, nsnull);
-    cairo_t *ctx = cairo_create(nsSVGUtils::GetCairoComputationalSurface());
 
-    GeneratePath(ctx, nsnull);
+  double xmin, ymin, xmax, ymax;
 
-    double xmin, ymin, xmax, ymax;
+  SetupCairoStrokeGeometry(ctx);
+  cairo_stroke_extents(ctx, &xmin, &ymin, &xmax, &ymax);
+  if (!IsDegeneratePath(xmin, ymin, xmax, ymax)) {
+    cairo_user_to_device(ctx, &xmin, &ymin);
+    cairo_user_to_device(ctx, &xmax, &ymax);
 
-    if (hasStroke) {
+    mRect = nsSVGUtils::ToBoundingPixelRect(xmin, ymin, xmax, ymax);
-      SetupCairoStrokeGeometry(ctx);
-      cairo_stroke_extents(ctx, &xmin, &ymin, &xmax, &ymax);
-    } else
-      cairo_fill_extents(ctx, &xmin, &ymin, &xmax, &ymax);
-
-    if (!IsDegeneratePath(xmin, ymin, xmax, ymax)) {
-      cairo_user_to_device(ctx, &xmin, &ymin);
-      cairo_user_to_device(ctx, &xmax, &ymax);
-
-      mRect = nsSVGUtils::ToBoundingPixelRect(xmin, ymin, xmax, ymax);
-    }
-    cairo_destroy(ctx);
   }
 
+  cairo_destroy(ctx);
+
   // Add in markers
   mRect = GetCoveredRegion();