Closed Bug 731301 Opened 11 years ago Closed 11 years ago

eliminate duplicate headers in gfx/

Categories

(Core :: Graphics, defect)

Product:
Core
Component:
Graphics
Type:
defect
Priority:
Not set
Severity:
normal

Tracking

()

Status:
RESOLVED FIXED
Milestone:
mozilla13

People

(Reporter: froydnj, Assigned: froydnj)

Details

Attachments

(1 file, 1 obsolete file)

patch
2.63 KB, patch
froydnj
: review+
Details | Diff | Splinter Review 
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?)
Attached patch patch (obsolete) — — Splinter Review 
There were a couple other source files in gfx/ which had the problem; the majority just happened to be in gfx/skia/.
Attachment #601323 - Flags: review?(jmuizelaar)
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.
Attachment #601323 - Flags: review?(jmuizelaar) → review-
Ah, fair enough.  Just the non-skia parts, then?
Comment on attachment 601323 [details] [diff] [review]
patch

The non skia parts are fine.
Attachment #601323 - Flags: review- → review+
Attached patch patch — — Splinter Review 
Updated to just the non-skia parts, then.
Attachment #601323 - Attachment is obsolete: true
Attachment #601605 - Flags: review+
Status: NEW → ASSIGNED
Summary: eliminate duplicate headers in gfx/skia → eliminate duplicate headers in gfx/
Whiteboard: [autoland-try:-b do -p all -u none -t none]
Whiteboard: [autoland-try:-b do -p all -u none -t none] → [autoland-in-queue]
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
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/autolanduser@mozilla.com-9c3f7776af4c
Whiteboard: [autoland-in-queue]
Oh, I guess this only autolands to try still. Well, checkin-needed!
In any event, I don't have L3 privileges. :)
Keywords: checkin-needed
https://hg.mozilla.org/mozilla-central/rev/d3bf0c140b25
Status: ASSIGNED → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.