482379 - Build failure in nsLayoutUtils.cpp, when building with "--disable-svg", due to nsGkAtoms::svgGlyphFrame usage

Status: RESOLVED FIXED

(Core :: Layout, defect)

Description

[Daniel Holbert [:dholbert]]

Attachment: fix

Right now, we fail when building with --disable-svg, due to a non-#ifdef'd usage of nsGkAtoms::svgGlyphFrame inside of nsLayoutUtils.cpp.

Attaching a patch to add "#ifdef MOZ_SVG" to fix this.

Comment 1

[Daniel Holbert [:dholbert]]

Pushed: http://hg.mozilla.org/mozilla-central/rev/37756ccaa268

Comment 2

[Daniel Holbert [:dholbert]]

This caused bustage on Windows:
http://tinderbox.mozilla.org/showlog.cgi?log=Firefox/1236653653.1236655774.7389.gz#err0
e:/builds/moz2_slave/mozilla-central-win32-debug/build/layout/base/nsLayoutUtils.cpp(3196) : error C2121: '#' : invalid character : possibly the result of a macro expansion
e:/builds/moz2_slave/mozilla-central-win32-debug/build/layout/base/nsLayoutUtils.cpp(3196) : error C2146: syntax error : missing ')' before identifier 'ifdef'
e:/builds/moz2_slave/mozilla-central-win32-debug/build/layout/base/nsLayoutUtils.cpp(3196) : error C2121: '#' : invalid character : possibly the result of a macro expansion
e:/builds/moz2_slave/mozilla-central-win32-debug/build/layout/base/nsLayoutUtils.cpp(3196) : error C2059: syntax error : ')'
e:/builds/moz2_slave/mozilla-central-win32-debug/build/layout/base/nsLayoutUtils.cpp(3196) : error C2143: syntax error : missing ';' before '{'
make[5]: Leaving directory `/e/builds/moz2_slave/mozilla-central-win32-debug/build/obj-firefox/layout/base'
make[5]: *** [nsLayoutUtils.obj] Error 2

So, backed out as http://hg.mozilla.org/mozilla-central/rev/4c23e141f2d8

Comment 3

[Daniel Holbert [:dholbert]]

Attachment: patch v2: use two separate NS_PRECONDITION statements

This patch just uses two separate NS_PRECONDITION statements, so that we don't have a #ifdef inside the precondition. (which is what caused the problem before, I think)

I'm rebuilding right now to sanity-check, and then I'll request review.

Comment 4

[Daniel Holbert [:dholbert]]

Comment on attachment 366487 [details] [diff] [review]
patch v2: use two separate NS_PRECONDITION statements

Yeah, this compiles successfully (at least on Linux), both with SVG enabled & with SVG disabled.

(Previous patch compiled on Linux, too, but I guess it wasn't supposed to - bz says in IRC that maybe it happened to succeed due to a GCC extension.)

Requesting r+sr for relanding.

Comment 5

[Daniel Holbert [:dholbert]]

patch v2 landed: http://hg.mozilla.org/mozilla-central/rev/e6357efb26b6

Comment 6

[Olli Pettay [:smaug][[e-mail]]]

http://hg.mozilla.org/releases/mozilla-1.9.1/rev/fcd9b42b399b

Comment 7

[Daniel Veditz [:dveditz]]

Was this a regression from bug 425265? That's one possible meaning of"blocking" it, but it's not explicit.

Comment 8

[Daniel Holbert [:dholbert]]

Yes, it was.  It's a build failure in new code ("nsLayoutUtils::InitTextRunContainerForPrinting") added in that bug's patch.