1290781 - Make the propagation of context paint to SVG glyphs much more robust

Status: RESOLVED FIXED

(Core :: SVG, defect)

Description

[Jonathan Watt [:jwatt]]

Our SVG-in-OpenType implementation allows SVG glyphs to use the context paint (fill/stroke/etc. specified on the text element that is being painted). The context paint is currently propagated to SVG glyphs by setting it on the Moz2D DrawTarget that is passed into nsSVGUtils::PaintSVGGlyph. This is going to be flakey though. The SVG code creates temporary DrawTarget objects in many places in order to paint things like masks, non-trivial clipPaths, patters, etc.

A better approach would be to temporarily set the context paint on the glyph element's SVGDocument while painting that glyph. That provides a convenient and reliable place from which to obtain the context paint.

Comment 1

[Jonathan Watt [:jwatt]]

Attachment: patch

Daniel is away just now, so hopefully you're okay to review this, Cameron.

Comment 2

[Cameron McCormack (:heycam)]

Comment on attachment 8776443 [details] [diff] [review]
patch

Review of attachment 8776443 [details] [diff] [review]:
-----------------------------------------------------------------

::: gfx/thebes/gfxSVGGlyphs.cpp
@@ -37,5 @@
>  using namespace mozilla;
>  
>  typedef mozilla::dom::Element Element;
>  
> -mozilla::gfx::UserDataKey gfxTextContextPaint::sUserDataKey;

Remove the declaration in gfxSVGGlyphs.h too.

::: layout/svg/SVGTextFrame.cpp
@@ +3723,5 @@
>  
>    TextRenderedRunIterator it(this, TextRenderedRunIterator::eVisibleFrames);
>    TextRenderedRun run = it.Current();
>  
> +  gfxTextContextPaint *outerContextPaint = nsSVGUtils::GetContextPaint(mContent);

Nit: move the "*" next to the type, while you're touching this line.

::: layout/svg/nsSVGPathGeometryFrame.cpp
@@ +803,5 @@
>        return;
>      }
>    }
>  
> +  gfxTextContextPaint *contextPaint = nsSVGUtils::GetContextPaint(mContent);

Nit: and here.

@@ +871,5 @@
>  void
>  nsSVGPathGeometryFrame::PaintMarkers(gfxContext& aContext,
>                                       const gfxMatrix& aTransform)
>  {
> +  gfxTextContextPaint *contextPaint = nsSVGUtils::GetContextPaint(mContent);

Nit: here too.

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/15bd0363e516
Make the propagation of context paint to SVG glyphs much more robust. r=heycam

Comment 4

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/15bd0363e516