370230 - bug 18333 broke --enable-perf-metrics builds

Status: RESOLVED FIXED

(Core :: XML, defect)

Description

[Mats Palmgren (inactive)]

STEPS TO REPRODUCE
1. add "ac_add_options --enable-perf-metrics" to your .mozconfig
2. build

ACTUAL RESULT
nsContentSink.cpp:988: error: ‘mWatch’ was not declared in this scope

mWatch is used but never declared AFAICT
http://bonsai.mozilla.org/cvsblame.cgi?file=/mozilla/content/base/src/nsContentSink.cpp&rev=1.60&root=/cvsroot&mark=972,973,979,988,1023#961

Comment 1

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

Attachment: Untested patch

I'll start a build once my CPU frees up to see if this does it.

Comment 2

[Mats Palmgren (inactive)]

Attachment: and this?

FYI, you'll need this too to find nsTimer.h

Comment 3

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

Attachment: that'll do it

Yup, those two patches together builds fine with --enable-perf-metrics. Attaching combined patch for easier review.

Comment 4

[Mats Palmgren (inactive)]

Comment on attachment 254972 [details] [diff] [review]
that'll do it

This patch was checked in (by Jonas) at 2007-02-13 13:18 PST.

Comment 5

[Mats Palmgren (inactive)]

Building a clean tree with -enable-perf-metrics still fails though:

make[5]: Entering directory `/usr/moz/opt-ff/mozilla/parser/htmlparser/src'
make[5]: *** No rule to make target `-lmozutil_s', needed by `libhtmlpars.so'.  Stop.
make[5]: Leaving directory `/usr/moz/opt-ff/mozilla/parser/htmlparser/src'
make[4]: *** [libs] Error 2
make[4]: Leaving directory `/usr/moz/opt-ff/mozilla/parser/htmlparser'
make[3]: *** [libs_tier_gecko] Error 2

A regression from bug 78081 perhaps?

Comment 6

[Mats Palmgren (inactive)]

Attachment: More fixes...

This makes my --enable-perf-metrics tree build again.
Not sure if this is the correct way of doing it though...

Comment 7

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

Not a blocker since this is just a testing tool

Comment 8

[Mats Palmgren (inactive)]

Comment on attachment 256784 [details] [diff] [review]
More fixes...

Checked in to trunk at 2007-03-14 09:44	PST

Comment 9

[Mats Palmgren (inactive)]

-> FIXED