931915 - Add an AppendRoundedRectToPath helper to Moz2D, then make gfxContext::RoundedRectangle use it

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Jonathan Watt [:jwatt]]

This code is cribbed from gfxContext::RoundedRectangle, but hacked up a fair bit to get rid of the dependencies on Mozilla code that Moz2D doesn't want to have.

Comment 1

[Jonathan Watt [:jwatt]]

Attachment: patch

Comment 2

[Jonathan Watt [:jwatt]]

Attachment: path to also make gfxContext::RoundedRectangle use Moz2D's AppendRoundedRectToPath helper

Comment 3

[Jonathan Watt [:jwatt]]

Bas, any idea why WinXP is failing to link this?

https://tbpl.mozilla.org/php/getParsedLog.php?id=29825670&tree=Try&full=1#error0

Comment 4

[Jonathan Watt [:jwatt]]

I tried changing the aCornerRadii type to |const Size*|, but that doesn't help. Still getting:

gfxContext.obj : error LNK2019: unresolved external symbol "void __cdecl mozilla::gfx::AppendRoundedRectToPath(class mozilla::gfx::PathBuilder *,struct mozilla::gfx::RectTyped<struct mozilla::gfx::UnknownUnits> const &,struct mozilla::gfx::SizeTyped<struct mozilla::gfx::UnknownUnits> const *,bool)" (?AppendRoundedRectToPath@gfx@mozilla@@YAXPAVPathBuilder@12@ABU?$RectTyped@UUnknownUnits@gfx@mozilla@@@12@PBU?$SizeTyped@UUnknownUnits@gfx@mozilla@@@12@_N@Z) referenced in function "public: void __thiscall gfxContext::RoundedRectangle(struct gfxRect const &,struct gfxCornerSizes const &,bool)" (?RoundedRectangle@gfxContext@@QAEXABUgfxRect@@ABUgfxCornerSizes@@_N@Z)

http://pear.warosu.org/c++filtjs/ says that the missing symbol demangles to:

void __cdecl mozilla::gfx::AppendRoundedRectToPath(class mozilla::gfx::PathBuilder *,struct mozilla::gfx::RectTyped const &,struct mozilla::gfx::SizeTyped const *,bool)

when it should be:

void __cdecl mozilla::gfx::AppendRoundedRectToPath(class mozilla::gfx::PathBuilder *,struct mozilla::gfx::RectTyped<struct mozilla::gfx::UnknownUnits> const &,struct mozilla::gfx::SizeTyped<struct mozilla::gfx::UnknownUnits> const *,bool)

Bas, any idea what's happening to the "<struct mozilla::gfx::UnknownUnits>" part that's missing off the second and third args on XP?

Comment 5

[Jonathan Watt [:jwatt]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/d9aa2d2a9939
https://hg.mozilla.org/integration/mozilla-inbound/rev/9eeddb8dc383

Comment 6

[Ed Morley [:emorley]]

Sadly had to backout this push due to failures linking on Windows:
https://tbpl.mozilla.org/php/getParsedLog.php?id=29971575&tree=Mozilla-Inbound

remote:   https://hg.mozilla.org/integration/mozilla-inbound/rev/c4f51fe7d637
remote:   https://hg.mozilla.org/integration/mozilla-inbound/rev/a750c58e428e
remote:   https://hg.mozilla.org/integration/mozilla-inbound/rev/9189b08d7d5e

Comment 7

[Jonathan Watt [:jwatt]]

Gah, the Try push showed it failing to link on the reference from content in a future patch that builds on this, not on the reference from inside its own library! XP sucks.

Thanks, Ed.

Comment 8

[Jonathan Watt [:jwatt]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/f9b22be50b69

Comment 9

[Jonathan Watt [:jwatt]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/425e452372a2

Comment 10

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/f9b22be50b69
https://hg.mozilla.org/mozilla-central/rev/425e452372a2