Meh. After the patches for bug 732429 and bug 769306, it turns out (bug 769593 comment 6) that I also need the SVGAutoRenderState::SetPaintingToWindow() call when painting SVG using display lists. If I'm moving that to nsDisplayOuterSVG::Paint, then nsSVGOuterSVGFrame::Paint becomes pretty much pointless and we might as well kill it.