Make sure to flush frames before calling GetPrimaryFrameFor in boxobject. Bug

282265, r=mconnor on the toolkit part, sr=neil, a=asa.

browser/base/content/browser.js

@@ -1393,14 +1393,7 @@ function updateGoMenu(goMenu)
   if (!history.ref)
     history.ref = "NC:HistoryRoot";
 
-  var treeView = history.view;
-  
-  if (!treeView) {
-    setTimeout(updateGoMenu, 0, goMenu);
-    return;
-  }
-  
-  var count = treeView.rowCount;
+  var count = history.view.rowCount;
   if (count > 10)
     count = 10;
 

layout/xul/base/src/nsBoxObject.cpp

@@ -164,8 +164,10 @@ nsIFrame*
 nsBoxObject::GetFrame()
 {
   nsIFrame* frame = nsnull;
-  if (mPresShell)
+  if (mPresShell) {
+    mPresShell->FlushPendingNotifications(Flush_Frames);
     mPresShell->GetPrimaryFrameFor(mContent, &frame);
+  }
   return frame;
 }