From 465b8fad66219f5c439f38fa3408999dc1248689 Mon Sep 17 00:00:00 2001
From: "jonas%sicking.cc"
 <jonas%sicking.cc@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 13 Feb 2007 21:18:25 +0000
Subject: [PATCH] Bug 370230: unbreak --enable-perf-metrics. Patch by me and
 Mats Palmgren. r/sr=jst

git-svn-id: svn://10.0.0.236/trunk@220080 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/src/nsContentSink.h                | 5 ++++-
 mozilla/content/html/document/src/nsHTMLContentSink.cpp | 4 ----
 mozilla/content/xbl/src/Makefile.in                     | 1 +
 mozilla/content/xml/document/src/nsXMLContentSink.cpp   | 1 -
 mozilla/content/xul/document/src/Makefile.in            | 1 +
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mozilla/content/base/src/nsContentSink.h b/mozilla/content/base/src/nsContentSink.h
index 9c1b55ebde9..c5e8460a161 100644
--- a/mozilla/content/base/src/nsContentSink.h
+++ b/mozilla/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)
 };
 
 
diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
index 88f1e85cb63..911699546c2 100644
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/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
diff --git a/mozilla/content/xbl/src/Makefile.in b/mozilla/content/xbl/src/Makefile.in
index 22d649c61e0..98932a92b38 100644
--- a/mozilla/content/xbl/src/Makefile.in
+++ b/mozilla/content/xbl/src/Makefile.in
@@ -67,6 +67,7 @@ REQUIRES	= xpcom \
 		  imglib2 \
 		  unicharutil \
 		  locale \
+		  util \
 		  $(NULL)
 
 CPPSRCS		= \
diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
index c95be074e87..4b47a7a11a2 100644
--- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/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
diff --git a/mozilla/content/xul/document/src/Makefile.in b/mozilla/content/xul/document/src/Makefile.in
index 4b585467edc..8151b22f7ed 100644
--- a/mozilla/content/xul/document/src/Makefile.in
+++ b/mozilla/content/xul/document/src/Makefile.in
@@ -71,6 +71,7 @@ REQUIRES	= xpcom \
 		  webshell \
 		  unicharutil \
 		  appshell \
+		  util \
 		  $(NULL)
 
 CPPSRCS		= nsXULControllers.cpp