912702 - Minimize the #includes in content/media

Status: RESOLVED FIXED

(Core :: Audio/Video, defect)

Description

[(no longer active)]

Attachment: Patch (v1)

https://tbpl.mozilla.org/?tree=Try&rev=7ea9f2e7ee52

Comment 1

[(no longer active)]

https://tbpl.mozilla.org/?tree=Try&rev=21ba4ce5d9ce

Comment 2

[(no longer active)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/2f15518f566e

Comment 3

[(no longer active)]

Backed out because of <https://tbpl.mozilla.org/php/getParsedLog.php?id=27436756&tree=Mozilla-Inbound#error1>:

https://hg.mozilla.org/integration/mozilla-inbound/rev/2e67cbcf6322

Comment 4

[Ralph Giles (:rillian)]

Something's #defining version_major or version_minor?

Comment 5

[(no longer active)]

(In reply to comment #4)
> Something's #defining version_major or version_minor?

Seems like it, but the question is, what code does that?  It surely is not in mozilla-central: <http://mxr.mozilla.org/mozilla-central/search?string=version_major&case=on&find=&findi=&filter=^[^\0]*%24&hitlimit=&tree=mozilla-central>

Comment 6

[(no longer active)]

Yay!

hardware/libhardware/include/hardware/hardware.h:112:#define version_major module_api_version

Comment 7

[(no longer active)]

Here's how this thing is pulled in:

/media/storage/moz/b2g-jb-emu/gecko/content/media/ogg/OggCodecState.h
../../../dist/include/mozilla/dom/HTMLMediaElement.h
../../../dist/include/mozilla/dom/TextTrack.h
../../../dist/include/nsDOMEventTargetHelper.h
../../../dist/include/nsEventListenerManager.h
../../../dist/include/nsGUIEvent.h
../../../dist/include/nsIWidget.h
../../../dist/include/mozilla/layers/LayersTypes.h
/media/storage/moz/b2g-jb-emu/frameworks/native/include/ui/GraphicBuffer.h
/media/storage/moz/b2g-jb-emu/frameworks/native/include/ui/ANativeObjectBase.h
/media/storage/moz/b2g-jb-emu/hardware/libhardware/include/hardware/gralloc.h
/media/storage/moz/b2g-jb-emu/hardware/libhardware/include/hardware/hardware.h

Comment 8

[(no longer active)]

Fixing that is very difficult, since VideoSegment.h #includes ImageContainer.h which would transitively #include LayersTypes.h which #includes <ui/GraphicBuffer.h>.

I'm just going to go ahead with the #undef trick.

Comment 9

[(no longer active)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/cb8146788ab1

Comment 10

[Ed Morley [:emorley]]

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