731301 - eliminate duplicate headers in gfx/

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Nathan Froyd [:froydnj]]

Running:

for f in $(find gfx -name '*.cpp'); do grep -B1 '#include' <(echo $f && grep '#include' $f | sort | uniq -d); done

finds a number of duplicate headers under gfx/skia.  Some of them are legitimate (e.g. template header files that require #defines prior to inclusion), but many are not.  The duplicates should be removed.

(Also, why do many skia source files insist on sticking includes in the middle of the file?)

Comment 1

[Nathan Froyd [:froydnj]]

Attachment: patch

There were a couple other source files in gfx/ which had the problem; the majority just happened to be in gfx/skia/.

Comment 2

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 601323 [details] [diff] [review]
patch

I'd rather not change skia like this in our tree as it will cause needless merge pain. We can do the skia part upstream.

Comment 3

[Nathan Froyd [:froydnj]]

Ah, fair enough.  Just the non-skia parts, then?

Comment 4

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 601323 [details] [diff] [review]
patch

The non skia parts are fine.

Comment 5

[Nathan Froyd [:froydnj]]

Attachment: patch

Updated to just the non-skia parts, then.

Comment 6

[Mozilla RelEng Bot]

Autoland Patchset:
	Patches: 601605
	Branch: mozilla-central => try
	Destination: http://hg.mozilla.org/try/pushloghtml?changeset=9c3f7776af4c
Try run started, revision 9c3f7776af4c. To cancel or monitor the job, see: https://tbpl.mozilla.org/?tree=Try&rev=9c3f7776af4c

Comment 7

[Mozilla RelEng Bot]

Try run for 9c3f7776af4c is complete.
Detailed breakdown of the results available here:
    https://tbpl.mozilla.org/?tree=Try&rev=9c3f7776af4c
Results (out of 14 total builds):
    success: 14
Builds (or logs if builds failed) available at:
http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/[e-mail]-9c3f7776af4c

Comment 8

[Joe Drew (not getting mail)]

Oh, I guess this only autolands to try still. Well, checkin-needed!

Comment 9

[Nathan Froyd [:froydnj]]

In any event, I don't have L3 privileges. :)

Comment 10

[Dão Gottwald [:dao]]

http://hg.mozilla.org/integration/mozilla-inbound/rev/d3bf0c140b25

Comment 11

[Marco Bonardo [:mak]]

https://hg.mozilla.org/mozilla-central/rev/d3bf0c140b25