907906 - Finishing up the gfx::Margin template code

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Bill McCloskey [inactive unless it's an emergency] (:billm)]

There's a problem in bug 907495 where we want to call Deflate on a ScreenIntRect with a margin parameter. ScreenIntRect is an IntRectTyped, where the Margin template parameter is a MarginTyped<UnknownUnits>. This margin type actually uses floats for storage. When Deflate is instantiated, it calls std::max on int(0) (because ScreenIntRect uses ints) and a float from the margin. This is rejected by the compiler.

Comment 1

[Kartikaya Gupta (email:[e-mail])]

Attachment: Patch

This compiles everywhere: https://tbpl.mozilla.org/?tree=Try&rev=00f6a13931e4

Comment 2

[Chris Lord [:cwiiis]]

Comment on attachment 793983 [details] [diff] [review]
Patch

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

LGTM.

::: gfx/2d/Rect.h
@@ +20,5 @@
> +    public units {
> +    typedef BaseMargin<int32_t, IntMarginTyped<units> > Super;
> +
> +    IntMarginTyped() : Super() {}
> +    IntMarginTyped(int32_t _top, int32_t _right, int32_t _bottom, int32_t _left) :

Is this _ notation what we use now? (as opposed to aTop, aRight, etc.)

Comment 3

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

(In reply to Chris Lord [:cwiiis] from comment #2)
> Comment on attachment 793983 [details] [diff] [review]
> Patch
> 
> Review of attachment 793983 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> LGTM.
> 
> ::: gfx/2d/Rect.h
> @@ +20,5 @@
> > +    public units {
> > +    typedef BaseMargin<int32_t, IntMarginTyped<units> > Super;
> > +
> > +    IntMarginTyped() : Super() {}
> > +    IntMarginTyped(int32_t _top, int32_t _right, int32_t _bottom, int32_t _left) :
> 
> Is this _ notation what we use now? (as opposed to aTop, aRight, etc.)

No, it isn't. Please fix that?

Comment 4

[Kartikaya Gupta (email:[e-mail])]

Isn't file consistency >>> style guidelines?

Comment 5

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

The file is inconsistent, so the style guide takes precedence.

Comment 6

[Kartikaya Gupta (email:[e-mail])]

Ok, I changed my patch to use the aFoo convention.

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

Comment 7

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/b5fff90c343d