1345168 - Get rid of OriginAttributes::Inherit

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, enhancement)

Description

[Andrea Marchesini [:baku]]

We had this method because the addonId value was not supposed to be copied when OriginAttributes was constructed from another one. Finally addonId is gone, and we can remove OriginAttributes::Inherits

Comment 1

[Andrea Marchesini [:baku]]

Attachment: inherit.patch

Comment 2

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

Comment on attachment 8844540 [details] [diff] [review]
inherit.patch

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

I had two nits, but looks good to me.

::: netwerk/base/LoadInfo.cpp
@@ +141,5 @@
>        }
>      }
>    }
>  
> +  // If CSP requires SRI (require-sri-for), then store that information

I think the unindent would have been better separated, but I manually diffed it.

@@ +258,2 @@
>  
> +#ifdef DEBUG

I thought MOZ_ASSERT was only compiled into DEBUG builds, and the if() would fall away as empty, so I think the ifdef is unneeded?

::: netwerk/base/Predictor.cpp
@@ +2282,5 @@
>  
>        if (loadContext) {
> +        OriginAttributes attrs;
> +        loadContext->GetOriginAttributes(attrs);
> +        originAttributes = attrs;

Is there a reason this couldn't just be loadContext->GetOriginAttributes(originAttributes) ?

Comment 3

[Andrea Marchesini [:baku]]

> I think the unindent would have been better separated, but I manually diffed
> it.

Right. Done.

> I thought MOZ_ASSERT was only compiled into DEBUG builds, and the if() would
> fall away as empty, so I think the ifdef is unneeded?

This is true, but I don't like to have an empty if().

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/3de78a28ad06
Fix the indentation in LoadInfo.cpp, r=tjr
https://hg.mozilla.org/integration/mozilla-inbound/rev/ffed210e1e21
Get rid of OriginAttributes::Inherit, r=tjr

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/3de78a28ad06
https://hg.mozilla.org/mozilla-central/rev/ffed210e1e21