1218454 - clean up including nsContentUtils.h

Status: RESOLVED FIXED

(Core :: General, defect)

Comment 1

[Nathan Froyd [:froydnj]]

Attachment: part 0 - don't #include nsContentUtils.h from CallbackObject.h

We used to need nsContentUtils.h here for nsCxPusher, but since that got
moved to ScriptSettings.h, we no longer need nsContentUtils.h for
anything.

Comment 2

[Nathan Froyd [:froydnj]]

Attachment: part 1 - move DialogValueHolder::Get out-of-line

No reason for one ::Get to be out-of-line and the other not.  This
change means that nsGlobalWindow.h doesn't depend on nsContentUtils.

Comment 3

[Nathan Froyd [:froydnj]]

Attachment: part 2 - move nsILoadContext::GetOriginAttributes out-of-line

There's no reason for this function to be declared in nsILoadContext's
class declaration.  A lot of fixups for nsContentUtils.h bootlegging are
necessary, however.

Comment 4

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 8678937 [details] [diff] [review]
part 0 - don't #include nsContentUtils.h from CallbackObject.h

r=me

Comment 5

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 8678938 [details] [diff] [review]
part 1 - move DialogValueHolder::Get out-of-line

>+DialogValueHolder::Get(JSContext* aCx, JS::Handle<JSObject*> aScope, nsIPrincipal* aSubject,
>+           JS::MutableHandle<JS::Value> aResult, mozilla::ErrorResult& aError)

Fix indent.  And watch the 80 col limit?

r=me

Comment 6

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 8678939 [details] [diff] [review]
part 2 - move nsILoadContext::GetOriginAttributes out-of-line

r=me, but I expect all those additional #include bits should be in part 0, not here....  Otherwise I expect applying just part 0 does not compile.

Similarly, should part 1 be before part 0?

Comment 7

[Nathan Froyd [:froydnj]]

Attachment: part 2a - fix bootlegging of nsContentUtils.h includes from nsILoadContext.h

A few additional #include bootleggings turned up that didn't seem to fit into
the previous two patches.  Should be trivial to review.

Comment 8

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 8694681 [details] [diff] [review]
part 2a - fix bootlegging of nsContentUtils.h includes from nsILoadContext.h

r=me

Comment 9

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/97b38c3a1063
https://hg.mozilla.org/integration/mozilla-inbound/rev/ae0fb501e531
https://hg.mozilla.org/integration/mozilla-inbound/rev/a06c0763b93a
https://hg.mozilla.org/integration/mozilla-inbound/rev/8ff6fdf5aeea

Comment 10

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/97b38c3a1063
https://hg.mozilla.org/mozilla-central/rev/ae0fb501e531
https://hg.mozilla.org/mozilla-central/rev/a06c0763b93a
https://hg.mozilla.org/mozilla-central/rev/8ff6fdf5aeea