Flush tags before calling StartLayout; otherwise we might end updoubl…

…e-constructing frames for whatever content we hadn't notified on yet. Bug378559, r+sr=sicking
rnewman · Apr 26, 2007 · a11e2ed · a11e2ed
1 parent 4266bdb
commit a11e2ed
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp
@@ -904,6 +904,14 @@ nsContentSink::StartLayout(PRBool aIgnorePendingSheets)
 
   mDeferredLayoutStart = PR_FALSE;
 
+  // Notify on all our content.  If none of our presshells have started layout
+  // yet it'll be a no-op except for updating our data structures, a la
+  // UpdateChildCounts() (because we don't want to double-notify on whatever we
+  // have right now).  If some of them _have_ started layout, we want to make
+  // sure to flush tags instead of just calling UpdateChildCounts() after we
+  // loop over the shells.
+  FlushTags();
+
   mLayoutStarted = PR_TRUE;
   mLastNotificationTime = PR_Now();