1540015 - Make Document.h treat mozilla::PresShell directly rather than via nsIPresShell

Status: RESOLVED FIXED

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

Comment 1

[Masayuki Nakano [:masayuki] (he/him)(JST, +0900)]

Attachment: Bug 1540015 - part 1: Make Document.h stop including nsIPresShell.h

If Document::GetShell() returns PresShell* rather than nsIPresShell, it's
a good step to deCOMTaminate PresShell.

This patch makes Document.h stop including nsIPresShell.h since
nsIPresShell.h includes Document.h indirectly and that causes bustage
when we make Document::GetShell() return PresShell*.

Comment 2

[Masayuki Nakano [:masayuki] (he/him)(JST, +0900)]

Attachment: Bug 1540015 - part 2: Make nsPresContext.h stop including nsIPresShel.h and nsIPresShellInlines.h

*Inlines.h shouldn't be included by another header file, but nsPresContext.h
does it. This causes include-hell which blocks the following fix.

Additionally, it causes an include hell between PresShell.h vs.
nsIPresShell.h and nsPresContext.h ifDocument.hincludesPresShell.h. Therefore, this patch also solves this include hell with addingnsPresContextInlines.h`.

Comment 3

[Masayuki Nakano [:masayuki] (he/him)(JST, +0900)]

Attachment: Bug 1540015 - part 3: Rename Document::GetShell() to Document::GetPresShell() and make it return PresShell* rather than nsIPresShell*

This makes Document::GetShell() return PresShell* instead of nsIPresShell.

Additonally, "shell" is unclear ("docshell" vs. "presshell"). Therefore, this
also renames Document::GetShell() to Document::GetPresShell().

Similarly, some other method names of Document are also renamed from
*Shell* to *PresShell*.

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/9561d2c36fa5
part 1: Make Document.h stop including nsIPresShell.h r=smaug
https://hg.mozilla.org/integration/autoland/rev/5723ddbc5c44
part 2: Make nsPresContext.h stop including nsIPresShel.h and nsIPresShellInlines.h r=smaug
https://hg.mozilla.org/integration/autoland/rev/7b71c9da0214
part 3: Rename Document::GetShell() to Document::GetPresShell() and make it return PresShell* rather than nsIPresShell* r=smaug,emilio

Comment 5

[Dorel Luca [:dluca]]

Backed out 3 changesets (bug 1540015) for build bustage. CLOSED TREE

Log:
https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=236901063&repo=autoland&lineNumber=20418

Push with failures:
https://treeherder.mozilla.org/#/jobs?repo=autoland&selectedJob=236901055&revision=7b71c9da0214e43368ab5cfb95344ca5ae13d670

Backout:
https://hg.mozilla.org/integration/autoland/rev/5d97989d4f0d6e6d357648963a4951661fa37628

Comment 6

[Masayuki Nakano [:masayuki] (he/him)(JST, +0900)]

Oh, sorry for the bustage. I forgot changing macOS only part, but I didn't test it on tryserver (confirmed only with Linux64 on tryserver). After verifying to build with macOS, I'll reland them with one line fix.

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/65f80cb57b30
part 1: Make Document.h stop including nsIPresShell.h r=smaug
https://hg.mozilla.org/integration/autoland/rev/f2267d0779f7
part 2: Make nsPresContext.h stop including nsIPresShel.h and nsIPresShellInlines.h r=smaug
https://hg.mozilla.org/integration/autoland/rev/f529b394cb11
part 3: Rename Document::GetShell() to Document::GetPresShell() and make it return PresShell* rather than nsIPresShell* r=smaug,emilio

Comment 8

[Oana Pop-Rus]

https://hg.mozilla.org/mozilla-central/rev/65f80cb57b30
https://hg.mozilla.org/mozilla-central/rev/f2267d0779f7
https://hg.mozilla.org/mozilla-central/rev/f529b394cb11