clean up including nsContentUtils.h

RESOLVED FIXED in Firefox 45

Status

()

Core
General
RESOLVED FIXED
3 years ago
2 years ago

People

(Reporter: froydnj, Assigned: froydnj)

Tracking

unspecified
mozilla45
Points:
---

Firefox Tracking Flags

(firefox45 fixed)

Details

Attachments

(4 attachments)

Comment hidden (empty)
Created attachment 8678937 [details] [diff] [review]
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.
Attachment #8678937 - Flags: review?(bzbarsky)
Created attachment 8678938 [details] [diff] [review]
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.
Attachment #8678938 - Flags: review?(bzbarsky)
Created attachment 8678939 [details] [diff] [review]
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.
Attachment #8678939 - Flags: review?(bzbarsky)
Comment on attachment 8678937 [details] [diff] [review]
part 0 - don't #include nsContentUtils.h from CallbackObject.h

r=me
Attachment #8678937 - Flags: review?(bzbarsky) → review+
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
Attachment #8678938 - Flags: review?(bzbarsky) → review+
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?
Attachment #8678939 - Flags: review?(bzbarsky) → review+
Depends on: 1229176
Created attachment 8694681 [details] [diff] [review]
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.
Attachment #8694681 - Flags: review?(bzbarsky)
Comment on attachment 8694681 [details] [diff] [review]
part 2a - fix bootlegging of nsContentUtils.h includes from nsILoadContext.h

r=me
Attachment #8694681 - Flags: review?(bzbarsky) → review+

Comment 10

2 years ago
bugherder
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
Status: NEW → RESOLVED
Last Resolved: 2 years ago
status-firefox45: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → mozilla45
You need to log in before you can comment on or make changes to this bug.