907011 - Enable Azure content for D3D9

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Matt Woodrow (:mattwoodrow)]

This should be a good stepping stone to having Azure content enabled for all windows systems.

Comment 1

[Matt Woodrow (:mattwoodrow)]

Attachment: Implement antialias mode for the Cairo Azure backend

Comment 2

[Matt Woodrow (:mattwoodrow)]

Attachment: Implement pattern matrices for the Cairo Azure backend

Comment 3

[Matt Woodrow (:mattwoodrow)]

Attachment: Implement CopyGlyphsToBuilder for Cairo Azure backend

Comment 4

[Matt Woodrow (:mattwoodrow)]

Attachment: Add PopGroupAndPaint to workaround precision issue

Comment 5

[Matt Woodrow (:mattwoodrow)]

Attachment: Create Azure DrawTargets in ThebesLayerD3D9

Comment 6

[Matt Woodrow (:mattwoodrow)]

Attachment: [WIP] Handle GDI fonts with Azure

Comment 7

[Bas Schouten (:bas.schouten)]

Comment on attachment 792590 [details] [diff] [review]
Implement CopyGlyphsToBuilder for Cairo Azure backend

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

::: gfx/2d/ScaledFontBase.cpp
@@ +99,5 @@
>  }
>  
>  void
>  ScaledFontBase::CopyGlyphsToBuilder(const GlyphBuffer &aBuffer, PathBuilder *aBuilder)
>  {

#ifdef USE_CAIRO

@@ +102,5 @@
>  ScaledFontBase::CopyGlyphsToBuilder(const GlyphBuffer &aBuffer, PathBuilder *aBuilder)
>  {
> +  PathBuilderCairo* builder = static_cast<PathBuilderCairo*>(aBuilder);
> +
> +  // Manually build the path for the PathBuilder.

nit: This comment does not apply.

Comment 8

[Bas Schouten (:bas.schouten)]

Comment on attachment 792589 [details] [diff] [review]
Implement pattern matrices for the Cairo Azure backend

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

::: gfx/2d/DrawTargetCairo.cpp
@@ +341,5 @@
> +    GfxMatrixToCairoMatrix(*matrix, mat);
> +    cairo_matrix_invert(&mat);
> +    cairo_pattern_set_matrix(pat, &mat);
> +  }
> +

nit: Remove extra whitespace :)

Comment 9

[Bas Schouten (:bas.schouten)]

Comment on attachment 792588 [details] [diff] [review]
Implement antialias mode for the Cairo Azure backend

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

nit: Lots of empty line whitespace in this patch, please fix :)

Comment 10

[Bas Schouten (:bas.schouten)]

Comment on attachment 792591 [details] [diff] [review]
Add PopGroupAndPaint to workaround precision issue

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

So I now fully understand the cause of this bug and it's deep within pixman. But we'll still want this patch because it will make us hit more fastpaths.

I agree with the basic idea of what you're doing, but I'm tempted to say we should try and see if we can cast a 'wider net' though considering how common the PopGroupToSource->Paint idiom is. What we can do is simply check if the surfTransform is the inverse of the current context Matrix (I could even be convinced to simply track this with a bool). (Which will practically always be true) And then we can simply do the trick you're already doing. This should actually make use able to hit a couple of more fastpaths in other backends by using Moz2D's CopySurface, what do you think?

Comment 11

[Matt Woodrow (:mattwoodrow)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/a2abafe9a213
https://hg.mozilla.org/integration/mozilla-inbound/rev/1f43ebeb69e2
https://hg.mozilla.org/integration/mozilla-inbound/rev/0b6062c70f2a

Comment 12

[Matt Woodrow (:mattwoodrow)]

Attachment: Don't copy to the snapshot when destroying

Comment 13

[Matt Woodrow (:mattwoodrow)]

Attachment: Use the window device context for font metrics

Comment 14

[Matt Woodrow (:mattwoodrow)]

Attachment: Enable azure content for d3d9

Comment 15

[Matt Woodrow (:mattwoodrow)]

Attachment: Fix windows native drawing

What do you think of this approach?

We could do the equivalent changes just in gfxWindowsNativeDrawing instead, but this seemed easy and useful.

Try run is fully green with the patches in this bug.

https://tbpl.mozilla.org/?tree=Try&rev=aba9e283679a

Just need reviews, and the revised PopGroupAndPaint patch and we're good to go!

Comment 16

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/a2abafe9a213
https://hg.mozilla.org/mozilla-central/rev/1f43ebeb69e2
https://hg.mozilla.org/mozilla-central/rev/0b6062c70f2a

Comment 17

[Bas Schouten (:bas.schouten)]

Comment on attachment 793275 [details] [diff] [review]
Don't copy to the snapshot when destroying

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

I hope this won't break anything else but from looking at the code I think it's good.

Comment 18

[Bas Schouten (:bas.schouten)]

Comment on attachment 793386 [details] [diff] [review]
Fix windows native drawing

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

We're keeping our usage of the Thebes API fairly high here. I believe we should replace this by doing something like a NATIVE_SURFACE_HDC that DrawTargetCairo handles internally, and optionally other DrawTargets may expose as well and give us fast Native drawing. How do you feel about that?

Comment 19

[Matt Woodrow (:mattwoodrow)]

Attachment: Workaround PopGroup precision issues

Patch by Bas, r=me.

Had to rename mat to oldMat to fix a compile failure, and changed the if condition to be !state.patternTransformChanged for it to take effect.

https://tbpl.mozilla.org/?tree=Try&rev=e1a5cf903ec0

Comment 20

[Bas Schouten (:bas.schouten)]

Comment on attachment 793386 [details] [diff] [review]
Fix windows native drawing

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

I -really- don't like this patch, but if it does the job for now, let's do it.

Comment 21

[Matt Woodrow (:mattwoodrow)]

Attachment: Create Azure DrawTargets in ThebesLayerD3D9 v2

Comment 22

[Matt Woodrow (:mattwoodrow)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/5355f7065af4
https://hg.mozilla.org/integration/mozilla-inbound/rev/cde5687940d8
https://hg.mozilla.org/integration/mozilla-inbound/rev/a7ddcc79c887
https://hg.mozilla.org/integration/mozilla-inbound/rev/eef7f16f13c7
https://hg.mozilla.org/integration/mozilla-inbound/rev/588d4d76f777
https://hg.mozilla.org/integration/mozilla-inbound/rev/a2d834dd81f2

Comment 23

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/5355f7065af4
https://hg.mozilla.org/mozilla-central/rev/cde5687940d8
https://hg.mozilla.org/mozilla-central/rev/a7ddcc79c887
https://hg.mozilla.org/mozilla-central/rev/eef7f16f13c7
https://hg.mozilla.org/mozilla-central/rev/588d4d76f777
https://hg.mozilla.org/mozilla-central/rev/a2d834dd81f2