919219 - Make gfxASurface.h cheap to include

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Benoit Jacob [:bjacob] (mostly away)]

A lot of files #include "gfxASurface.h" and it's not very easy to avoid: gfxASurface.h is a widely-used base class.

So the most beneficial thing that we may be able to do about that is to make gfxASurface.h as cheap to include as possible.

Comment 1

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: Split nsMainThreadSurfaceRef out of gfxASurface.h, into ImageContainer.h

That seems to be where it belongs, and it takes a big shard off my foot.

Comment 2

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: Trim gfxASurface more

In particular:
 - Don't include gfxRect.h anymore, defer some functions out-of-line
 - Use a MFB AutoPtr (something I'm adding in one of the blockers of the present bug) instead of a nsAutoPtr so we don't drag in all the XPCOM stuff, cycle collection, strings, etc
 - Include nscoretypes.h (another things I'm adding in another blocker of this bug) only, not nscore.h.

Comment 3

[Benoit Jacob [:bjacob] (mostly away)]

Also: include only nsStringFwd.h in INTERNAL code, and gfxIntSize and nsIntSize are the same type, this patch has some churn around that, I'll try to make a cleaner patch in that respect.

Comment 4

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: Trim gfxASurface more

So, I cancel my AutoPtr patch because MFBT already has ScopedDeletePtr, and so this new patch is using it instead; and I'm also cancelling my nscoretypes.h patch because I actually checked the preprocessed code for nscore.h and it's only 3K lines (I had been told that it was 40K, but that was apparently wrong) so nscore.h doesn't appear to be working avoiding to include.

And the gfxIntSize -> nsIntSize changes are actually needed as gfxIntSize is a typedef for nsIntSize so can't be forward-declared.

Comment 5

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: Trim gfxASurface more

Hadn't correctly refreshed this patch.

Comment 6

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 808216 [details] [diff] [review]
Split nsMainThreadSurfaceRef out of gfxASurface.h, into ImageContainer.h

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

::: gfx/layers/ImageContainer.h
@@ +79,5 @@
> +  }
> +};
> +
> +#endif
> +

It would be good to move this into ImageContainer.cpp if possible.

Comment 7

[Benoit Jacob [:bjacob] (mostly away)]

http://hg.mozilla.org/integration/mozilla-inbound/rev/0202ef23a9ea
http://hg.mozilla.org/integration/mozilla-inbound/rev/6a26a65777a5

Comment 8

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/0202ef23a9ea
https://hg.mozilla.org/mozilla-central/rev/6a26a65777a5
https://hg.mozilla.org/mozilla-central/rev/d25367fc9f37
https://hg.mozilla.org/mozilla-central/rev/2c1c9f9eb30e