Better build bustage fix for bug 495728

layout/base/nsPresContext.h

@@ -69,6 +69,7 @@
 #include "nsTArray.h"
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
+#include "nsContentUtils.h"
 
 class nsImageLoader;
 #ifdef IBMBIDI
@@ -1088,6 +1089,8 @@ struct nsAutoLayoutPhase {
         // Once bug 337957 is fixed this should become an NS_ASSERTION
         NS_WARN_IF_FALSE(mPresContext->mLayoutPhaseCount[eLayoutPhase_FrameC] == 0,
                          "recurring into frame construction");
+        NS_ASSERTION(!nsContentUtils::IsSafeToRunScript(),
+                     "constructing frames and scripts are not blocked");
         break;
       default:
         break;

widget/tests/TestWinTSF.cpp

@@ -58,8 +58,13 @@
 // some of the includes make use of internal string types
 #define nsAString_h___
 #define nsString_h___
+#define nsReadableUtils_h___
 class nsAFlatString;
 class nsAFlatCString;
+class nsAdoptingString;
+class nsAdoptingCString;
+class nsXPIDLString;
+template<class T> class nsReadingIterator;
 #endif
 
 #include "nscore.h"
@@ -94,6 +99,7 @@ class nsAFlatCString;
 #ifndef MOZILLA_INTERNAL_API
 #undef nsString_h___
 #undef nsAString_h___
+#undef nsReadableUtils_h___
 #endif
 
 static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);