594322 - Build with --enable-system-cairo broken

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[ojab]

User-Agent:       Mozilla/5.0 (X11; Linux x86_64; rv:2.0b6pre) Gecko/20100907 Firefox/4.0b6pre
Build Identifier: 

Build with system cairo is broken in r52174:7ad078323b52 and later:

c++ -o gfxASurface.o -c -I../../dist/stl_wrappers …
/sources/mozilla-central/gfx/thebes/gfxASurface.cpp:475:1: error: 'CAIRO_SURFACE_TYPE_D2D' was not declared in this scope
make[5]: *** [gfxASurface.o] Error 1
make[5]: Leaving directory `/home/ojab/src/firefox/gfx/thebes'


Reproducible: Always

Comment 1

[Bas Schouten (:bas.schouten)]

Hrmph, I wonder why it's trying to use that define.

Comment 2

[Octoploid]

Adding a simple ifdef wrapper should fix it.

#ifdef CAIRO_HAS_D2D_SURFACE
PR_STATIC_ASSERT(CAIRO_SURFACE_TYPE_D2D == gfxASurface::SurfaceTypeD2D);
#endif

Comment 3

[Bas Schouten (:bas.schouten)]

(In reply to comment #2)
> Adding a simple ifdef wrapper should fix it.
> 
> #ifdef CAIRO_HAS_D2D_SURFACE
> PR_STATIC_ASSERT(CAIRO_SURFACE_TYPE_D2D == gfxASurface::SurfaceTypeD2D);
> #endif

You're absolutely right, I was looking at the wrong version of the code in which the line numbers were off. Thank you.

Comment 4

[Bas Schouten (:bas.schouten)]

Attachment: Conditionally assert CAIRO_HAS_D2D_SURFACE

Comment 5

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 473126 [details] [diff] [review]
Conditionally assert CAIRO_HAS_D2D_SURFACE

Can you add a PR_STATIC_ASSERT for skia to ensure that the cairo surfaces have numbers that line up

Comment 6

[Bas Schouten (:bas.schouten)]

Attachment: Conditionally assert CAIRO_HAS_D2D_SURFACE v2

Statically assert Skia as well for none-windows platforms. Ready to land.

Comment 7

[Jeff Muizelaar [:jrmuizel]]

This is the same as last patch

Comment 8

[Bas Schouten (:bas.schouten)]

Attachment: Conditionally assert CAIRO_HAS_D2D_SURFACE v3

Qref somehow got disturbed. Better now.

Comment 9

[Bas Schouten (:bas.schouten)]

s is caused by bug 594624. There's a patch on that bug.

Comment 10

[Dão Gottwald [:dao]]

http://hg.mozilla.org/mozilla-central/rev/8e0fce7d5b49

Comment 11

[Octoploid]

This fixed one build error, but introduced another one.
See attached patch.

Comment 12

[Octoploid]

Attachment: CAIRO_SURFACE_TYPE_SKIA ifdef wrapper

Comment 13

[Takanori MATSUURA]

(In reply to comment #11)
> This fixed one build error, but introduced another one.
> See attached patch.

I agree with you. However you should file it as a new bug.

Comment 14

[Takanori MATSUURA]

(In reply to comment #13)
> I agree with you. However you should file it as a new bug.

File as bug 595805 for comments #11 and comment #12.