Comprehensive fix for the issues with disappearing filtered objects.

Fixes #304407 and possibly a few other bugs.
Revert incorrect _item_bbox changes from r12528.

Fixed bugs:
  - https://launchpad.net/bugs/304407

(bzr r12648)

5 files changed, 22 insertions, 25 deletions

diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp
index b2b3e68a2..71a7f8906 100644
--- a/src/display/drawing-item.cpp
+++ b/src/display/drawing-item.cpp
@@ -290,17 +290,10 @@ DrawingItem::setZOrder(unsigned z)
     _markForRendering();
 }
 
-void DrawingItem::setItemBounds(Geom::OptRect const &bounds)
-{
-    if (!bounds) return;
-    Geom::IntRect copy = bounds->roundOutwards();
-    if (_filter) _filter->area_enlarge(copy, this);
-    this->setFilterBounds(copy);
-}
-
-void DrawingItem::setFilterBounds(Geom::OptRect const &bounds)
+void
+DrawingItem::setItemBounds(Geom::OptRect const &bounds)
 {
-    if (bounds) _filter_bbox = bounds;
+    _item_bbox = bounds;
 }
 
 /**
@@ -368,10 +361,14 @@ DrawingItem::update(Geom::IntRect const &area, UpdateContext const &ctx, unsigne
 
     if (to_update & STATE_BBOX) {
         // compute drawbox
-        if (_filter && render_filters && _filter_bbox) {
-            Geom::OptRect enlarged = _filter_bbox;
-            *enlarged *= ctm();
-            _drawbox = enlarged->roundOutwards();
+        if (_filter && render_filters) {
+            Geom::OptRect enlarged = _filter->filter_effect_area(_item_bbox);
+            if (enlarged) {
+                *enlarged *= ctm();
+                _drawbox = enlarged->roundOutwards();
+            } else {
+                _drawbox = Geom::OptIntRect();
+            }
         } else {
             _drawbox = _bbox;
         }
diff --git a/src/display/drawing-item.h b/src/display/drawing-item.h
index c69b996b4..e03bbd0f7 100644
--- a/src/display/drawing-item.h
+++ b/src/display/drawing-item.h
@@ -89,7 +89,7 @@ public:
 
     Geom::OptIntRect geometricBounds() const { return _bbox; }
     Geom::OptIntRect visualBounds() const { return _drawbox; }
-    Geom::OptRect filterBounds() const { return _filter_bbox; }
+    Geom::OptRect itemBounds() const { return _item_bbox; }
     Geom::Affine ctm() const { return _ctm; }
     Geom::Affine transform() const { return _transform ? *_transform : Geom::identity(); }
     Drawing &drawing() const { return _drawing; }
@@ -176,7 +176,9 @@ protected:
     Geom::Affine _ctm; ///< Total transform from item coords to display coords
     Geom::OptIntRect _bbox; ///< Bounding box in display (pixel) coords including stroke
     Geom::OptIntRect _drawbox; ///< Full visual bounding box - enlarged by filters, shrunk by clips and masks
-    Geom::OptRect _filter_bbox; ///< Used by filters when settings bounds
+    Geom::OptRect _item_bbox; ///< Geometric bounding box in item's user space.
+                              ///  This is used to compute the filter effect region and render in
+                              ///  objectBoundingBox units.
 
     DrawingItem *_clip;
     DrawingItem *_mask;
diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp
index 9ad18243e..e80f12486 100644
--- a/src/display/drawing-shape.cpp
+++ b/src/display/drawing-shape.cpp
@@ -179,8 +179,8 @@ DrawingShape::_renderItem(DrawingContext &ct, Geom::IntRect const &area, unsigne
         // update fill and stroke paints.
         // this cannot be done during nr_arena_shape_update, because we need a Cairo context
         // to render svg:pattern
-        has_fill   = _nrstyle.prepareFill(ct, _filter_bbox);
-        has_stroke = _nrstyle.prepareStroke(ct, _filter_bbox);
+        has_fill   = _nrstyle.prepareFill(ct, _item_bbox);
+        has_stroke = _nrstyle.prepareStroke(ct, _item_bbox);
         has_stroke &= (_nrstyle.stroke_width != 0);
 
         if (has_fill || has_stroke) {
diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp
index fa9ce4ff8..55d54b770 100644
--- a/src/display/drawing-text.cpp
+++ b/src/display/drawing-text.cpp
@@ -398,8 +398,8 @@ unsigned DrawingText::_renderItem(DrawingContext &ct, Geom::IntRect const &/*are
     using Geom::X;
     using Geom::Y;
 
-    has_fill   = _nrstyle.prepareFill(  ct, _bbox);
-    has_stroke = _nrstyle.prepareStroke(ct, _bbox);
+    has_fill   = _nrstyle.prepareFill(  ct, _item_bbox);
+    has_stroke = _nrstyle.prepareStroke(ct, _item_bbox);
 
     if (has_fill || has_stroke) {
         Geom::Affine rotinv;
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index 1289362aa..af9c15cd8 100644
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -114,14 +114,12 @@ int Filter::render(Inkscape::DrawingItem const *item, DrawingContext &graphic, D
 
     Geom::Affine trans = item->ctm();
 
-    // Get filter area, the filter_effect_area is already done in visualBounds
-    Geom::OptRect filter_area = item->filterBounds();
-    // Use the geometricBounds as a backup solution
+    Geom::OptRect filter_area = filter_effect_area(item->itemBounds());
     if (!filter_area) return 1;
 
     FilterUnits units(_filter_units, _primitive_units);
     units.set_ctm(trans);
-    units.set_item_bbox(filter_area);
+    units.set_item_bbox(item->itemBounds());
     units.set_filter_area(*filter_area);
 
     std::pair<double,double> resolution
@@ -201,7 +199,7 @@ void Filter::area_enlarge(Geom::IntRect &bbox, Inkscape::DrawingItem const *item
     }
 
     Geom::Rect item_bbox;
-    Geom::OptRect maybe_bbox = item->geometricBounds();
+    Geom::OptRect maybe_bbox = item->itemBounds();
     if (maybe_bbox.isEmpty()) {
         // Code below needs a bounding box
         return;