1516366 - Shrink nsDocument.h

Status: RESOLVED FIXED

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

Description

[Emilio Cobos Álvarez [:emilio]]

I have some patches that turn nsDocument.h into:

  https://hg.mozilla.org/try/file/07a5f837ca68/dom/base/nsDocument.h

Which means that we can merge it with nsIDocument and rename that to mozilla::dom::Document trivially after that. Still trying to make it build on windows but after that's done I plan to post those patches here.

Comment 1

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Sprinkle some ToSupports around xpcom. r?froydnj

This will be needed for the next patches since the cast from nsIDocument* to
nsISupports* will become ambiguous, and I don't really want to replace all users
of nsCOMPtr<nsIDocument> with RefPtr.

We have ToSupports to handle this, so use it.

Comment 2

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Remove uses of nsCOMArray<nsIDocument>. r?bzbarsky,smaug

Just use nsTArray. They're used to keep an array of strong references to
documents, and never use nsISupports-specific methods.

Plus they're are allocated on the stack so it should be safe to access them via
ranged for, so do that.

This is needed because nsCOMArray<T> depends on the cast from T to nsISupports
not to be ambiguous. I could fix that if needed, but it seems easier to just not
use it in these two cases.

Depends on D15350

Comment 3

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Move base classes from nsDocument to nsIDocument. r?bzbarsky,smaug

This is a big step in order to merge both.

Also allows to remove some very silly casts, though it causes us to add some
ToSupports around to deal with ambiguity of casts from nsIDocument to
nsISupports, and add a dummy nsISupports implementation that will go away later
in the series.

Depends on D15351

Comment 4

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Remove unused mFirstBaseNodeWithHref member. r?bzbarsky,smaug

This is done via SetBaseURIUsingFirstBaseWithHref now.

Depends on D15352

Comment 5

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Remove unused declaration. r?bzbarsky,smaug

Depends on D15353

Comment 6

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Move some static functions from nsDocument to nsIDocument. r?bzbarsky,smaug

Depends on D15354

Comment 7

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Move some setters from nsDocument to nsIDocument. r?bzbarsky,smaug

Depends on D15355

Comment 8

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Move mExpandoAndGeneration from nsDocument to nsIDocument. r?bzbarsky,smaug

Now that bindgen can represent it properly (bug 1516365) we can do this.

Depends on D15356

Comment 9

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Merge nsIDocument::DocAddSizeOfExcludingThis and nsDocument::DocAddSizeOfExcludingThis. r?bzbarsky,smaug

No point in having both really.

Depends on D15357

Comment 10

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Move various miscellaneous methods from nsDocument to nsIDocument. r?bzbarsky,smaug

Depends on D15358

Comment 11

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Move EventTarget methods to nsIDocument. r?bzbarsky,smaug

Depends on D15359

Comment 12

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Move BlockOnload and UnlockOnload to nsIDocument, and devirtualize them. r?bzbarsky,smaug

Depends on D15360

Comment 13

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Move Init, Destroy and RemovedFromDocShell to nsIDocument. r?bzbarsky,smaug

Depends on D15361

Comment 14

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Move CloneDocHelper to nsIDocument. r?bzbarsky,smaug

Depends on D15362

Comment 15

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Move NS_DOCUMENT_NOTIFY_OBSERVERS to nsIDocument.h. r?bzbarsky,smaug

Depends on D15363

Comment 16

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Move CC / nsISupports bits to nsIDocument. r?bzbarsky,smaug

This allows us to remove the MOZ_CRASH-ing implementation I added earlier in
this series.

Depends on D15364

Comment 17

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1516366 - Move nsOnloadBlocker and nsDocumentOnStack to nsDocument.cpp, and shrink nsDocument.h to the minimmum. r?bzbarsky,smaug

This needs to add a few of includes in other places which were relying on the
massive (now gone) list in nsDocument.h.

I also needed to move an AnimationTimeline destructor out of line because it
relied on dom::Animation being defined, yet Animation.h includes
AnimationTimeline.h, so include hell.

Depends on D15365

Comment 18

[Emilio Cobos Álvarez [:emilio]]

I didn't know who of bz or smaug was going to be busiest, so just whoever gets to review the patches first works for me, really :)

Comment 19

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/0b47b25aa767
Sprinkle some ToSupports around xpcom. r=froydnj
https://hg.mozilla.org/integration/mozilla-inbound/rev/afc9a2a4fbf9
Remove uses of nsCOMArray<nsIDocument>. r=bzbarsky,smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/83c1af1bfaaf
Move base classes from nsDocument to nsIDocument. r=smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/d3d4a2c095db
Remove unused mFirstBaseNodeWithHref member. r=smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/04d2bdfcd3c2
Remove unused declaration. r=smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/567f4ee5bcbe
Move some static functions from nsDocument to nsIDocument. r=smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/944265c10475
Move some setters from nsDocument to nsIDocument. r=smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/684eb521216e
Move mExpandoAndGeneration from nsDocument to nsIDocument. r=smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/599dfe52907f
Merge nsIDocument::DocAddSizeOfExcludingThis and nsDocument::DocAddSizeOfExcludingThis. r=smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/2909ddd2f7b1
Move various miscellaneous methods from nsDocument to nsIDocument. r=smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/0afa3b75fd66
Move EventTarget methods to nsIDocument. r=smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/57acc0f12815
Move BlockOnload and UnlockOnload to nsIDocument, and devirtualize them. r=smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/b6772da1eff1
Move Init, Destroy and RemovedFromDocShell to nsIDocument. r=smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/87aa3be318fa
Move CloneDocHelper to nsIDocument. r=smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/947bf2c04aa5
Move NS_DOCUMENT_NOTIFY_OBSERVERS to nsIDocument.h. r=smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/1c324add4b92
Move CC / nsISupports bits to nsIDocument. r=smaug
https://hg.mozilla.org/integration/mozilla-inbound/rev/16a7aabf4fea
Move nsOnloadBlocker and nsDocumentOnStack to nsDocument.cpp, and shrink nsDocument.h to the minimmum. r=smaug

Comment 20

[Cosmin Sabou [:CosminS]]

https://hg.mozilla.org/mozilla-central/rev/0b47b25aa767
https://hg.mozilla.org/mozilla-central/rev/afc9a2a4fbf9
https://hg.mozilla.org/mozilla-central/rev/83c1af1bfaaf
https://hg.mozilla.org/mozilla-central/rev/d3d4a2c095db
https://hg.mozilla.org/mozilla-central/rev/04d2bdfcd3c2
https://hg.mozilla.org/mozilla-central/rev/567f4ee5bcbe
https://hg.mozilla.org/mozilla-central/rev/944265c10475
https://hg.mozilla.org/mozilla-central/rev/684eb521216e
https://hg.mozilla.org/mozilla-central/rev/599dfe52907f
https://hg.mozilla.org/mozilla-central/rev/2909ddd2f7b1
https://hg.mozilla.org/mozilla-central/rev/0afa3b75fd66
https://hg.mozilla.org/mozilla-central/rev/57acc0f12815
https://hg.mozilla.org/mozilla-central/rev/b6772da1eff1
https://hg.mozilla.org/mozilla-central/rev/87aa3be318fa
https://hg.mozilla.org/mozilla-central/rev/947bf2c04aa5
https://hg.mozilla.org/mozilla-central/rev/1c324add4b92
https://hg.mozilla.org/mozilla-central/rev/16a7aabf4fea