880502 - Including GraphicBuffer.h in LayersTypes.h causes ogg to not build on JB

Status: RESOLVED FIXED

(Core :: Graphics: Layers, defect)

Description

[Michael Wu [:mwu]]

On JB, hardware/libhardware/include/hardware/hardware.h defines version_minor and version_major which causes OggCodecState.cpp to not build. GraphicBuffer.h ends up including hardware/hardware.h.

Comment 1

[Kelsey Gilbert [:jgilbert]]

Attachment: patch: prune includes.

At least one include path is:
OggCodecState.h
MediaDecoderReader.h
ImageLayers.h
Layers.h
LayersTypes.h
<ui/GraphicBuffer.h>

Comment 2

[Kelsey Gilbert [:jgilbert]]

Attachment: patch: assert that we aren't colliding with defines

Something like this might help in tracking this down.
I don't really know how to build such that I hit this bug, locally.

Comment 3

[Michael Wu [:mwu]]

Neat! I was about to just give up and undef these on gonk.

GraphicBuffer.h is still included after applying your patch, though.

...
nsGUIEvent.h
nsIWidget.h
LayersTypes.h
GraphicBuffer.h

Working backwards to figure out the include path is somewhat tough. Couldn't follow backwards after nsGUIEvent.h.

I feel like we should try prying LayerRenderState out of LayersTypes.h..

Comment 4

[Kelsey Gilbert [:jgilbert]]

(In reply to Michael Wu [:mwu] from comment #3)
> Neat! I was about to just give up and undef these on gonk.
> 
> GraphicBuffer.h is still included after applying your patch, though.
> 
> ...
> nsGUIEvent.h
> nsIWidget.h
> LayersTypes.h
> GraphicBuffer.h
> 
> Working backwards to figure out the include path is somewhat tough. Couldn't
> follow backwards after nsGUIEvent.h.
> 
> I feel like we should try prying LayerRenderState out of LayersTypes.h..

Agreed. nsIWidget should definitely never be including something like GraphicBuffer.

Comment 5

[Michael Wu [:mwu]]

Attachment: Minimal fix to make OggCodecState.cpp build

This moves an include so the #define version_major/version_minor crap in hardware/hardware.h gets defined early enough that things compile.

Comment 6

[Michael Wu [:mwu]]

https://hg.mozilla.org/projects/birch/rev/a51fbfd1e186

Comment 7

[Phil Ringnalda (:philor)]

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