Bug 370230: unbreak --enable-perf-metrics. Patch by me and Mats Palmgren. r/sr=jst

content/base/src/nsContentSink.h

@@ -61,7 +61,7 @@
 #include "nsIContentSink.h"
 #include "prlog.h"
 #include "nsIRequest.h"
-
+#include "nsTimer.h"
 
 class nsIDocument;
 class nsIURI;
@@ -269,6 +269,9 @@ protected:
   PRInt32 mInMonolithicContainer;
 
   PRInt32 mInNotification;
+
+  // Measures content model creation time for current document
+  MOZ_TIMER_DECLARE(mWatch)
 };
 
 

content/html/document/src/nsHTMLContentSink.cpp

@@ -110,7 +110,6 @@
 #include "nsISelectElement.h"
 
 #include "nsIStyleSheetLinkingElement.h"
-#include "nsTimer.h"
 #include "nsITimer.h"
 #include "nsDOMError.h"
 #include "nsContentPolicyUtils.h"
@@ -325,9 +324,6 @@ protected:
 #ifdef NS_DEBUG
   void ForceReflow();
 #endif
-
-  // Measures content model creation time for current document
-  MOZ_TIMER_DECLARE(mWatch)
 };
 
 class SinkContext

content/xbl/src/Makefile.in

@@ -67,6 +67,7 @@ REQUIRES	= xpcom \
 		  imglib2 \
 		  unicharutil \
 		  locale \
+		  util \
 		  $(NULL)
 
 CPPSRCS		= \

content/xml/document/src/nsXMLContentSink.cpp

@@ -95,7 +95,6 @@
 #include "nsContentErrors.h"
 #include "nsIDOMProcessingInstruction.h"
 #include "nsNodeUtils.h"
-#include "nsTimer.h"
 #include "nsIScriptGlobalObject.h"
 
 #ifdef MOZ_SVG

content/xul/document/src/Makefile.in

@@ -71,6 +71,7 @@ REQUIRES	= xpcom \
 		  webshell \
 		  unicharutil \
 		  appshell \
+		  util \
 		  $(NULL)
 
 CPPSRCS		= nsXULControllers.cpp