Bug 677101 - Move nsAutoLayoutPhase to its own header; r=tn
authorMs2ger <ms2ger@gmail.com>
Mon, 08 Aug 2011 17:14:34 +0200
changeset 74772 36989c74b287e7f7d132e3ecb80c02b54a88c6bd
parent 74771 e0ae0b46f4f546b0041f962cff9076c46d6d0901
child 74773 561821863607ac216fbf273475dfde8d57fa7f2d
child 74811 f37a51e43d5a94d5945682e177812b35991169cc
push id235
push userbzbarsky@mozilla.com
push dateTue, 27 Sep 2011 17:13:04 +0000
treeherdermozilla-beta@2d1e082d176a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstn
bugs677101
milestone8.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 677101 - Move nsAutoLayoutPhase to its own header; r=tn
layout/base/nsAutoLayoutPhase.h
layout/base/nsCSSFrameConstructor.cpp
layout/base/nsPresContext.h
layout/base/nsPresShell.cpp
new file mode 100644
--- /dev/null
+++ b/layout/base/nsAutoLayoutPhase.h
@@ -0,0 +1,133 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   L. David Baron <dbaron@dbaron.org>, Mozilla Corporation (original author)
+ *   Timothy Nikkel <tnikkel@gmail.com>
+ *   Boris Zbarsky <bzbarsky@mit.edu>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsAutoLayoutPhase_h
+#define nsAutoLayoutPhase_h
+
+#ifdef DEBUG
+
+#include "nsPresContext.h"
+#include "nsContentUtils.h"
+
+struct nsAutoLayoutPhase {
+  nsAutoLayoutPhase(nsPresContext* aPresContext, nsLayoutPhase aPhase)
+    : mPresContext(aPresContext), mPhase(aPhase), mCount(0)
+  {
+    Enter();
+  }
+
+  ~nsAutoLayoutPhase()
+  {
+    Exit();
+    NS_ASSERTION(mCount == 0, "imbalanced");
+  }
+
+  void Enter()
+  {
+    switch (mPhase) {
+      case eLayoutPhase_Paint:
+        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Paint] == 0,
+                     "recurring into paint");
+        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Reflow] == 0,
+                     "painting in the middle of reflow");
+        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_FrameC] == 0,
+                     "painting in the middle of frame construction");
+        break;
+      case eLayoutPhase_Reflow:
+        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Paint] == 0,
+                     "reflowing in the middle of a paint");
+        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Reflow] == 0,
+                     "recurring into reflow");
+        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_FrameC] == 0,
+                     "reflowing in the middle of frame construction");
+        break;
+      case eLayoutPhase_FrameC:
+        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Paint] == 0,
+                     "constructing frames in the middle of a paint");
+        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Reflow] == 0,
+                     "constructing frames in the middle of reflow");
+        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_FrameC] == 0,
+                     "recurring into frame construction");
+        NS_ASSERTION(!nsContentUtils::IsSafeToRunScript(),
+                     "constructing frames and scripts are not blocked");
+        break;
+      default:
+        break;
+    }
+    ++(mPresContext->mLayoutPhaseCount[mPhase]);
+    ++mCount;
+  }
+
+  void Exit()
+  {
+    NS_ASSERTION(mCount > 0 && mPresContext->mLayoutPhaseCount[mPhase] > 0,
+                 "imbalanced");
+    --(mPresContext->mLayoutPhaseCount[mPhase]);
+    --mCount;
+  }
+
+private:
+  nsPresContext* mPresContext;
+  nsLayoutPhase mPhase;
+  PRUint32 mCount;
+};
+
+#define AUTO_LAYOUT_PHASE_ENTRY_POINT(pc_, phase_) \
+  nsAutoLayoutPhase autoLayoutPhase((pc_), (eLayoutPhase_##phase_))
+#define LAYOUT_PHASE_TEMP_EXIT() \
+  PR_BEGIN_MACRO \
+    autoLayoutPhase.Exit(); \
+  PR_END_MACRO
+#define LAYOUT_PHASE_TEMP_REENTER() \
+  PR_BEGIN_MACRO \
+    autoLayoutPhase.Enter(); \
+  PR_END_MACRO
+
+#else
+
+#define AUTO_LAYOUT_PHASE_ENTRY_POINT(pc_, phase_) \
+  PR_BEGIN_MACRO PR_END_MACRO
+#define LAYOUT_PHASE_TEMP_EXIT() \
+  PR_BEGIN_MACRO PR_END_MACRO
+#define LAYOUT_PHASE_TEMP_REENTER() \
+  PR_BEGIN_MACRO PR_END_MACRO
+
+#endif
+
+#endif // nsAutoLayoutPhase_h
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -113,16 +113,17 @@
 #include "nsContentErrors.h"
 #include "nsIPrincipal.h"
 #include "nsStyleUtil.h"
 #include "nsBox.h"
 #include "nsTArray.h"
 #include "nsGenericDOMDataNode.h"
 #include "mozilla/dom/Element.h"
 #include "FrameLayerBuilder.h"
+#include "nsAutoLayoutPhase.h"
 
 #ifdef MOZ_XUL
 #include "nsIRootBox.h"
 #include "nsIDOMXULCommandDispatcher.h"
 #include "nsIDOMXULDocument.h"
 #include "nsIXULDocument.h"
 #endif
 #ifdef ACCESSIBILITY
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -1343,103 +1343,16 @@ nsPresContext::ForgetUpdatePluginGeometr
   if (mContainsUpdatePluginGeometryFrame) {
     nsRootPresContext* rootPC = GetRootPresContext();
     if (rootPC) {
       rootPC->RootForgetUpdatePluginGeometryFrame(aFrame);
     }
   }
 }
 
-#ifdef DEBUG
-
-struct nsAutoLayoutPhase {
-  nsAutoLayoutPhase(nsPresContext* aPresContext, nsLayoutPhase aPhase)
-    : mPresContext(aPresContext), mPhase(aPhase), mCount(0)
-  {
-    Enter();
-  }
-
-  ~nsAutoLayoutPhase()
-  {
-    Exit();
-    NS_ASSERTION(mCount == 0, "imbalanced");
-  }
-
-  void Enter()
-  {
-    switch (mPhase) {
-      case eLayoutPhase_Paint:
-        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Paint] == 0,
-                     "recurring into paint");
-        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Reflow] == 0,
-                     "painting in the middle of reflow");
-        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_FrameC] == 0,
-                     "painting in the middle of frame construction");
-        break;
-      case eLayoutPhase_Reflow:
-        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Paint] == 0,
-                     "reflowing in the middle of a paint");
-        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Reflow] == 0,
-                     "recurring into reflow");
-        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_FrameC] == 0,
-                     "reflowing in the middle of frame construction");
-        break;
-      case eLayoutPhase_FrameC:
-        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Paint] == 0,
-                     "constructing frames in the middle of a paint");
-        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_Reflow] == 0,
-                     "constructing frames in the middle of reflow");
-        NS_ASSERTION(mPresContext->mLayoutPhaseCount[eLayoutPhase_FrameC] == 0,
-                     "recurring into frame construction");
-        NS_ASSERTION(!nsContentUtils::IsSafeToRunScript(),
-                     "constructing frames and scripts are not blocked");
-        break;
-      default:
-        break;
-    }
-    ++(mPresContext->mLayoutPhaseCount[mPhase]);
-    ++mCount;
-  }
-
-  void Exit()
-  {
-    NS_ASSERTION(mCount > 0 && mPresContext->mLayoutPhaseCount[mPhase] > 0,
-                 "imbalanced");
-    --(mPresContext->mLayoutPhaseCount[mPhase]);
-    --mCount;
-  }
-
-private:
-  nsPresContext *mPresContext;
-  nsLayoutPhase mPhase;
-  PRUint32 mCount;
-};
-
-#define AUTO_LAYOUT_PHASE_ENTRY_POINT(pc_, phase_) \
-  nsAutoLayoutPhase autoLayoutPhase((pc_), (eLayoutPhase_##phase_))
-#define LAYOUT_PHASE_TEMP_EXIT() \
-  PR_BEGIN_MACRO \
-    autoLayoutPhase.Exit(); \
-  PR_END_MACRO
-#define LAYOUT_PHASE_TEMP_REENTER() \
-  PR_BEGIN_MACRO \
-    autoLayoutPhase.Enter(); \
-  PR_END_MACRO
-
-#else
-
-#define AUTO_LAYOUT_PHASE_ENTRY_POINT(pc_, phase_) \
-  PR_BEGIN_MACRO PR_END_MACRO
-#define LAYOUT_PHASE_TEMP_EXIT() \
-  PR_BEGIN_MACRO PR_END_MACRO
-#define LAYOUT_PHASE_TEMP_REENTER() \
-  PR_BEGIN_MACRO PR_END_MACRO
-
-#endif
-
 #ifdef MOZ_REFLOW_PERF
 
 #define DO_GLOBAL_REFLOW_COUNT(_name) \
   aPresContext->CountReflows((_name), (nsIFrame*)this); 
 #else
 #define DO_GLOBAL_REFLOW_COUNT(_name)
 #endif // MOZ_REFLOW_PERF
 
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -130,17 +130,17 @@
   // for |#ifdef DEBUG| code
 #include "prenv.h"
 #include "nsAlgorithm.h"
 #include "nsIAttribute.h"
 #include "nsIGlobalHistory2.h"
 #include "nsDisplayList.h"
 #include "nsRegion.h"
 #include "nsRenderingContext.h"
-
+#include "nsAutoLayoutPhase.h"
 #ifdef MOZ_REFLOW_PERF
 #include "nsFontMetrics.h"
 #endif
 
 #include "nsIReflowCallback.h"
 
 #include "nsPIDOMWindow.h"
 #include "nsFocusManager.h"